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

rename index to idx to avoid shadowing

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15408 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-16 16:27:35 +00:00
parent e0cd9d7006
commit d6777fe3f7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/roken/environment.c
View File

@@ -65,7 +65,7 @@ find_var(char **env, char *assignment, size_t len)
static int static int
rk_read_env_file(FILE *F, char ***env, int *assigned) rk_read_env_file(FILE *F, char ***env, int *assigned)
{ {
int index = 0; int idx = 0;
int i; int i;
char **l; char **l;
char buf[BUFSIZ], *p, *r; char buf[BUFSIZ], *p, *r;
@@ -74,7 +74,7 @@ rk_read_env_file(FILE *F, char ***env, int *assigned)
*assigned = 0; *assigned = 0;
for(index = 0; *env != NULL && (*env)[index] != NULL; index++); for(idx = 0; *env != NULL && (*env)[idx] != NULL; idx++);
l = *env; l = *env;
/* This is somewhat more relaxed on what it accepts then /* This is somewhat more relaxed on what it accepts then
@@ -104,19 +104,19 @@ rk_read_env_file(FILE *F, char ***env, int *assigned)
continue; continue;
} }
tmp = realloc(l, (index+2) * sizeof (char *)); tmp = realloc(l, (idx+2) * sizeof (char *));
if(tmp == NULL) { if(tmp == NULL) {
ret = ENOMEM; ret = ENOMEM;
break; break;
} }
l = tmp; l = tmp;
l[index] = strdup(p); l[idx] = strdup(p);
if(l[index] == NULL) { if(l[idx] == NULL) {
ret = ENOMEM; ret = ENOMEM;
break; break;
} }
l[++index] = NULL; l[++idx] = NULL;
(*assigned)++; (*assigned)++;
} }
if(ferror(F)) if(ferror(F))