oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename to avoid shadowing

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15446 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-16 20:25:20 +00:00
parent 70aae422eb
commit c3579d1f6c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/krb5/config_file.c
View File

@@ -560,10 +560,10 @@ krb5_config_vget_strings(krb5_context context,
goto cleanup; goto cleanup;
s = strtok_r(tmp, " \t", &pos); s = strtok_r(tmp, " \t", &pos);
while(s){ while(s){
char **tmp = realloc(strings, (nstr + 1) * sizeof(*strings)); char **tmp2 = realloc(strings, (nstr + 1) * sizeof(*strings));
if(tmp == NULL) if(tmp2 == NULL)
goto cleanup; goto cleanup;
strings = tmp; strings = tmp2;
strings[nstr] = strdup(s); strings[nstr] = strdup(s);
nstr++; nstr++;
if(strings[nstr-1] == NULL) if(strings[nstr-1] == NULL)

6
lib/krb5/fcache.c
View File

@@ -492,11 +492,11 @@ init_fcc (krb5_context context,
goto out; goto out;
} }
while(length > 0) { while(length > 0) {
int16_t tag, data_len; int16_t dtag, data_len;
int i; int i;
int8_t dummy; int8_t dummy;
ret = krb5_ret_int16 (sp, &tag); ret = krb5_ret_int16 (sp, &dtag);
if(ret) { if(ret) {
krb5_clear_error_string(context); krb5_clear_error_string(context);
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
@@ -508,7 +508,7 @@ init_fcc (krb5_context context,
ret = KRB5_CC_FORMAT; ret = KRB5_CC_FORMAT;
goto out; goto out;
} }
switch (tag) { switch (dtag) {
case FCC_TAG_DELTATIME : case FCC_TAG_DELTATIME :
ret = krb5_ret_int32 (sp, &context->kdc_sec_offset); ret = krb5_ret_int32 (sp, &context->kdc_sec_offset);
if(ret) { if(ret) {