From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 1/7] lscpu: fix shadow declaration [smatch scan]
Date: Sun, 28 Jul 2013 22:11:15 +0100 [thread overview]
Message-ID: <1375045881-11978-1-git-send-email-kerolasa@iki.fi> (raw)
sys-utils/lscpu.c:572:22: warning: symbol 'fd' shadows an earlier one
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
sys-utils/lscpu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index fbaaa31..98cee16 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -569,15 +569,15 @@ read_hypervisor(struct lscpu_desc *desc, struct lscpu_modifier *mod)
/* IBM PR/SM */
} else if (path_exist(_PATH_PROC_SYSINFO)) {
- FILE *fd = path_fopen("r", 0, _PATH_PROC_SYSINFO);
+ FILE *sysinfo_fd = path_fopen("r", 0, _PATH_PROC_SYSINFO);
char buf[BUFSIZ];
- if (!fd)
+ if (!sysinfo_fd)
return;
desc->hyper = HYPER_IBM;
desc->hypervisor = "PR/SM";
desc->virtype = VIRT_FULL;
- while (fgets(buf, sizeof(buf), fd) != NULL) {
+ while (fgets(buf, sizeof(buf), sysinfo_fd) != NULL) {
char *str;
if (!strstr(buf, "Control Program:"))
@@ -601,7 +601,7 @@ read_hypervisor(struct lscpu_desc *desc, struct lscpu_modifier *mod)
while ((str = strstr(desc->hypervisor, " ")))
memmove(str, str + 1, strlen(str));
}
- fclose(fd);
+ fclose(sysinfo_fd);
}
/* OpenVZ/Virtuozzo - /proc/vz dir should exist
--
1.8.3.4
next reply other threads:[~2013-07-28 21:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-28 21:11 Sami Kerola [this message]
2013-07-28 21:11 ` [PATCH 2/7] setarch: prefer preprocessor rather than autotools check Sami Kerola
2013-07-28 21:11 ` [PATCH 3/7] build-sys: use m4 quoting consistently Sami Kerola
2013-07-28 21:11 ` [PATCH 4/7] build-sys: prefer AS_CASE rather than shell 'case' Sami Kerola
2013-07-28 21:11 ` [PATCH 5/7] build-sys: prefer AS_IF rather than shell 'if' Sami Kerola
2013-07-28 21:11 ` [PATCH 6/7] build-sys: use backticks rather than $() for commands in configure Sami Kerola
2013-07-28 21:11 ` [PATCH 7/7] rev: use string printing rather than character output Sami Kerola
2013-08-01 11:41 ` [PATCH 1/7] lscpu: fix shadow declaration [smatch scan] Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375045881-11978-1-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox