diff options
| author | Ron <ron@debian.org> | 2009-06-27 04:44:24 +0930 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-07-09 01:35:50 -0700 |
| commit | 41167151599307ea9574a5342e7e030779424e25 (patch) | |
| tree | f3c62e4ed06ebcc6b7bb4ced55d4def54e01e2fb | |
| parent | e04942f86c38f31f934632fbb7976a56dd94eb50 (diff) | |
| download | uClibc-alpine-41167151599307ea9574a5342e7e030779424e25.tar.bz2 uClibc-alpine-41167151599307ea9574a5342e7e030779424e25.tar.xz | |
Don't shadow stat with a local variable
Signed-off-by: Ron Lee <ron@debian.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
| -rw-r--r-- | utils/ldconfig.c | 10 | ||||
| -rw-r--r-- | utils/ldd.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/utils/ldconfig.c b/utils/ldconfig.c index c30416bb2..6c2362ad2 100644 --- a/utils/ldconfig.c +++ b/utils/ldconfig.c @@ -585,18 +585,18 @@ static char *get_extpath(void) { char *res = NULL, *cp; FILE *file; - struct stat stat; + struct stat st; char realconffile[BUFFER_SIZE]; if (!chroot_realpath(chroot_dir, conffile, realconffile)) return NULL; if ((file = fopen(realconffile, "r")) != NULL) { - fstat(fileno(file), &stat); - res = xmalloc(stat.st_size + 1); - fread(res, 1, stat.st_size, file); + fstat(fileno(file), &st); + res = xmalloc(st.st_size + 1); + fread(res, 1, st.st_size, file); fclose(file); - res[stat.st_size] = '\0'; + res[st.st_size] = '\0'; /* convert comments fo spaces */ for (cp = res; *cp; /*nada */ ) { diff --git a/utils/ldd.c b/utils/ldd.c index 9874a30e8..41da97360 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -707,8 +707,8 @@ foo: && ehdr->e_ident[EI_VERSION] == EV_CURRENT && MATCH_MACHINE(ehdr->e_machine)) { - struct stat statbuf; - if (stat(interp->path, &statbuf) == 0 && S_ISREG(statbuf.st_mode)) { + struct stat st; + if (stat(interp->path, &st) == 0 && S_ISREG(st.st_mode)) { pid_t pid; int status; static const char *const environment[] = { |