From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 08/19] lscpu: fix shadow declaration
Date: Wed, 25 Jul 2012 21:15:29 +0200 [thread overview]
Message-ID: <1343243745-1172-12-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1343243745-1172-1-git-send-email-kerolasa@iki.fi>
sys-utils/lscpu.c:1084:8: warning: declaration of 'buf' shadows a previous local [-Wshadow]
sys-utils/lscpu.c:1077:7: warning: shadowed declaration is here [-Wshadow]
sys-utils/lscpu.c:1144:9: warning: declaration of 'buf' shadows a previous local [-Wshadow]
sys-utils/lscpu.c:1077:7: warning: shadowed declaration is here [-Wshadow]
sys-utils/lscpu.c:1196:8: warning: declaration of 'buf' shadows a previous local [-Wshadow]
sys-utils/lscpu.c:1077:7: warning: shadowed declaration is here [-Wshadow]
sys-utils/lscpu.c:1197:7: warning: declaration of 'i' shadows a previous local [-Wshadow]
sys-utils/lscpu.c:1078:6: warning: shadowed declaration is here [-Wshadow]
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
sys-utils/lscpu.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 3984b2d..7a712de 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1081,7 +1081,7 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
print_s(_("Architecture:"), desc->arch);
if (desc->mode) {
- char buf[64], *p = buf;
+ char mbuf[64], *p = mbuf;
if (desc->mode & MODE_32BIT) {
strcpy(p, "32-bit, ");
@@ -1092,7 +1092,7 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
p += 8;
}
*(p - 2) = '\0';
- print_s(_("CPU op-mode(s):"), buf);
+ print_s(_("CPU op-mode(s):"), mbuf);
}
#if !defined(WORDS_BIGENDIAN)
print_s(_("Byte Order:"), "Little Endian");
@@ -1141,11 +1141,11 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
*/
if (path_exist(_PATH_PROC_SYSINFO)) {
FILE *fd = path_fopen("r", 0, _PATH_PROC_SYSINFO);
- char buf[BUFSIZ];
+ char pbuf[BUFSIZ];
int t0, t1, t2;
- while (fd && fgets(buf, sizeof(buf), fd) != NULL) {
- if (sscanf(buf, "CPU Topology SW:%d%d%d%d%d%d",
+ while (fd && fgets(pbuf, sizeof(pbuf), fd) != NULL) {
+ if (sscanf(pbuf, "CPU Topology SW:%d%d%d%d%d%d",
&t0, &t1, &t2, &books, &sockets_per_book,
&cores_per_socket) == 6)
break;
@@ -1193,13 +1193,12 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
if (desc->dispatching >= 0)
print_s(_("Dispatching mode:"), _(disp_modes[desc->dispatching]));
if (desc->ncaches) {
- char buf[512];
- int i;
+ char cbuf[512];
for (i = desc->ncaches - 1; i >= 0; i--) {
- snprintf(buf, sizeof(buf),
+ snprintf(cbuf, sizeof(cbuf),
_("%s cache:"), desc->caches[i].name);
- print_s(buf, desc->caches[i].size);
+ print_s(cbuf, desc->caches[i].size);
}
}
--
1.7.11.3
next prev parent reply other threads:[~2012-07-25 19:15 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-25 19:15 [PATCH 0/27] preparation to release some time soon Sami Kerola
2012-07-25 19:15 ` [PATCH 1/3] tests: partx changed default output format Sami Kerola
2012-07-26 10:07 ` Karel Zak
2012-07-25 19:15 ` [PATCH 2/3] tests: look: add words file Sami Kerola
2012-07-26 10:08 ` Karel Zak
2012-07-25 19:15 ` [PATCH 3/3] tests: fdisk: change expected test output Sami Kerola
2012-07-26 10:32 ` Karel Zak
2012-07-25 19:15 ` [PATCH 01/19] mkswap: fix shadow declaration Sami Kerola
2012-07-26 10:32 ` Karel Zak
2012-07-25 19:15 ` [PATCH 02/19] libmount: " Sami Kerola
2012-07-26 10:33 ` Karel Zak
2012-07-25 19:15 ` [PATCH 03/19] sulogin: " Sami Kerola
2012-07-26 10:34 ` Karel Zak
2012-07-25 19:15 ` [PATCH 04/19] blkid: " Sami Kerola
2012-07-26 10:35 ` Karel Zak
2012-07-25 19:15 ` [PATCH 05/19] lslocks: " Sami Kerola
2012-07-25 19:15 ` [PATCH 06/19] whereis: " Sami Kerola
2012-07-25 19:15 ` [PATCH 07/19] eject: " Sami Kerola
2012-07-25 19:15 ` Sami Kerola [this message]
2012-07-25 19:15 ` [PATCH 09/19] setterm: " Sami Kerola
2012-07-25 19:15 ` [PATCH 10/19] more: " Sami Kerola
2012-07-25 19:15 ` [PATCH 11/19] ul: " Sami Kerola
2012-07-25 19:15 ` [PATCH 12/19] hexdump: " Sami Kerola
2012-07-25 19:15 ` [PATCH 13/19] include: define format to be constant in xasprintf() Sami Kerola
2012-07-25 19:15 ` [PATCH 14/19] fdisk: add noreturn function attribute Sami Kerola
2012-07-25 19:15 ` [PATCH 15/19] libblkid: " Sami Kerola
2012-07-25 19:15 ` [PATCH 16/19] libmount: " Sami Kerola
2012-07-25 19:15 ` [PATCH 17/19] vipw: " Sami Kerola
2012-07-25 19:15 ` [PATCH 18/19] script: add noreturn function attributes Sami Kerola
2012-07-25 19:15 ` [PATCH 19/19] more: add noreturn function attribute Sami Kerola
2012-07-25 19:15 ` [PATCH 1/5] ddate: russian manual missing from package Sami Kerola
2012-07-25 19:15 ` [PATCH 2/5] docs: clean up sulogin.8 manual Sami Kerola
2012-07-25 19:15 ` [PATCH 3/5] wdctl: fix conflicting types on old systems Sami Kerola
2012-07-25 19:15 ` [PATCH 4/5] dmesg: inform user when klogctl() or read_buffer() fails Sami Kerola
2012-07-25 19:15 ` [PATCH 5/5] docs: tell about irc channel Sami Kerola
2012-07-26 10:07 ` [PATCH 0/27] preparation to release some time soon Karel Zak
2012-07-26 12:16 ` 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=1343243745-1172-12-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;
as well as URLs for NNTP newsgroup(s).