Don't shadow stat with a local variable

Signed-off-by: Ron Lee <ron@debian.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/utils/ldconfig.c b/utils/ldconfig.c
index 505316b..139b5f9 100644 (file)
--- a/utils/ldconfig.c
+++ b/utils/ldconfig.c
@@ -558,18 +558,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 02b37f1..e7a94cb 100644 (file)
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -683,8 +683,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[] = {