From c3579d1f6c84c51d49c62e59fbabcccc934fd36b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 16 Jun 2005 20:25:20 +0000
Subject: [PATCH] rename to avoid shadowing

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15446 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/config_file.c | 6 +++---
 lib/krb5/fcache.c      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/krb5/config_file.c b/lib/krb5/config_file.c
index 125491604..736fd5a2c 100644
--- a/lib/krb5/config_file.c
+++ b/lib/krb5/config_file.c
@@ -560,10 +560,10 @@ krb5_config_vget_strings(krb5_context context,
 	    goto cleanup;
 	s = strtok_r(tmp, " \t", &pos);
 	while(s){
-	    char **tmp = realloc(strings, (nstr + 1) * sizeof(*strings));
-	    if(tmp == NULL)
+	    char **tmp2 = realloc(strings, (nstr + 1) * sizeof(*strings));
+	    if(tmp2 == NULL)
 		goto cleanup;
-	    strings = tmp;
+	    strings = tmp2;
 	    strings[nstr] = strdup(s);
 	    nstr++;
 	    if(strings[nstr-1] == NULL)
diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c
index b52ab68fa..2d68cd859 100644
--- a/lib/krb5/fcache.c
+++ b/lib/krb5/fcache.c
@@ -492,11 +492,11 @@ init_fcc (krb5_context context,
 	    goto out;
 	}
 	while(length > 0) {
-	    int16_t tag, data_len;
+	    int16_t dtag, data_len;
 	    int i;
 	    int8_t dummy;
 
-	    ret = krb5_ret_int16 (sp, &tag);
+	    ret = krb5_ret_int16 (sp, &dtag);
 	    if(ret) {
 		krb5_clear_error_string(context);
 		ret = KRB5_CC_FORMAT;
@@ -508,7 +508,7 @@ init_fcc (krb5_context context,
 		ret = KRB5_CC_FORMAT;
 		goto out;
 	    }
-	    switch (tag) {
+	    switch (dtag) {
 	    case FCC_TAG_DELTATIME :
 		ret = krb5_ret_int32 (sp, &context->kdc_sec_offset);
 		if(ret) {