From d4b143830a36a842a6b8d44e7fda64ae5c3d0518 Mon Sep 17 00:00:00 2001
From: "ludovic.rousseau"
 <ludovic.rousseau@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Fri, 2 Apr 2010 12:21:48 +0000
Subject: [PATCH] Rename variable rand in rand_buf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pkcs15-oberthur-awp.c: In function ‘awp_new_container_entry’:
pkcs15-oberthur-awp.c:241: warning: declaration of ‘rand’ shadows a global declaration
/usr/include/stdlib.h:176: warning: shadowed declaration is here


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4204 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/pkcs15init/pkcs15-oberthur-awp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pkcs15init/pkcs15-oberthur-awp.c b/src/pkcs15init/pkcs15-oberthur-awp.c
index 81f7daa9..f3a63196 100644
--- a/src/pkcs15init/pkcs15-oberthur-awp.c
+++ b/src/pkcs15init/pkcs15-oberthur-awp.c
@@ -238,23 +238,23 @@ awp_new_container_entry(struct sc_pkcs15_card *p15card, unsigned char *buff, int
 	struct sc_context *ctx = p15card->card->ctx;
 	int ii, mm, rv = 0;
 	int marks[5] = {4,6,8,10,0};
-	unsigned char rand[0x10];
+	unsigned char rand_buf[0x10];
 
 	SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_NORMAL);
 	if (len<0x34) 
 		SC_TEST_RET(ctx, SC_LOG_DEBUG_NORMAL, SC_ERROR_INCORRECT_PARAMETERS, "Invalid container update size");
 
-	rv = sc_get_challenge(p15card->card, rand, sizeof(rand));
+	rv = sc_get_challenge(p15card->card, rand_buf, sizeof(rand_buf));
 	SC_TEST_RET(ctx, SC_LOG_DEBUG_NORMAL, rv, "Cannot get challenge");
 
 	*(buff + 12) = 0x26;
 	*(buff + 13) = '{';
-	for (ii=0, mm = 0; ii<sizeof(rand); ii++)   {
+	for (ii=0, mm = 0; ii<sizeof(rand_buf); ii++)   {
 		if (ii==marks[mm])   {
 			*(buff + 14 + ii*2 + mm) = '-';
 			mm++;
 		}
-		sprintf((char *)(buff + 14 + ii*2 + mm),"%02X", rand[ii]);
+		sprintf((char *)(buff + 14 + ii*2 + mm),"%02X", rand_buf[ii]);
 	}
 	*(buff + 14 + ii*2 + mm) = (unsigned char)'}';