summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon <ron@debian.org>2009-06-27 04:44:24 +0930
committerMike Frysinger <vapier@gentoo.org>2009-07-05 20:27:17 -0400
commit916bd8eff0cac4abfd816b95f104064965623f3f (patch)
treef3763653b8e87f8ad26152d9ab8a456bb597253b
parent95fa074d64848a0e4db471d6546b91ad60048d52 (diff)
Don't shadow stat with a local variable
Signed-off-by: Ron Lee <ron@debian.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--utils/ldconfig.c10
-rw-r--r--utils/ldd.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/utils/ldconfig.c b/utils/ldconfig.c
index 505316b15..139b5f9cb 100644
--- 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 02b37f1cb..e7a94cbc4 100644
--- 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[] = {