From: Leonardo Bras <leobras.c@gmail.com>
To: lkcamp@lists.libreplanetbr.org
Cc: Leonardo Bras <leobras.c@gmail.com>,
Borislav Petkov <bp@alien8.de>,
David.Laight@aculab.com, Andy Lutomirski <luto@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
helen@koikeco.de, Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 1/5] x86/vdso: Renames variable to fix shadow warning.
Date: Wed, 24 Oct 2018 01:03:50 -0300 [thread overview]
Message-ID: <20181024040354.24879-2-leobras.c@gmail.com> (raw)
In-Reply-To: <20181024040354.24879-1-leobras.c@gmail.com>
The go32() and go64() functions have an argument and a local variable
called ‘name’. Rename both to clarify the code and to fix a warning
with -Wshadow.
Signed-off-by: Leonardo Bras <leobras.c@gmail.com>
---
arch/x86/entry/vdso/vdso2c.h | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h
index fa847a620f40..a20b134de2a8 100644
--- a/arch/x86/entry/vdso/vdso2c.h
+++ b/arch/x86/entry/vdso/vdso2c.h
@@ -7,7 +7,7 @@
static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
void *stripped_addr, size_t stripped_len,
- FILE *outfile, const char *name)
+ FILE *outfile, const char *image_name)
{
int found_load = 0;
unsigned long load_size = -1; /* Work around bogus warning */
@@ -93,11 +93,12 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
int k;
ELF(Sym) *sym = raw_addr + GET_LE(&symtab_hdr->sh_offset) +
GET_LE(&symtab_hdr->sh_entsize) * i;
- const char *name = raw_addr + GET_LE(&strtab_hdr->sh_offset) +
- GET_LE(&sym->st_name);
+ const char *sym_name = raw_addr +
+ GET_LE(&strtab_hdr->sh_offset) +
+ GET_LE(&sym->st_name);
for (k = 0; k < NSYMS; k++) {
- if (!strcmp(name, required_syms[k].name)) {
+ if (!strcmp(sym_name, required_syms[k].name)) {
if (syms[k]) {
fail("duplicate symbol %s\n",
required_syms[k].name);
@@ -134,7 +135,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
if (syms[sym_vvar_start] % 4096)
fail("vvar_begin must be a multiple of 4096\n");
- if (!name) {
+ if (!image_name) {
fwrite(stripped_addr, stripped_len, 1, outfile);
return;
}
@@ -157,7 +158,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
}
fprintf(outfile, "\n};\n\n");
- fprintf(outfile, "const struct vdso_image %s = {\n", name);
+ fprintf(outfile, "const struct vdso_image %s = {\n", image_name);
fprintf(outfile, "\t.data = raw_data,\n");
fprintf(outfile, "\t.size = %lu,\n", mapping_size);
if (alt_sec) {
--
2.19.1
next prev parent reply other threads:[~2018-10-24 4:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 4:03 [PATCH v3 0/5] Adds -Wshadow on KBUILD_HOSTCFLAGS and fix warnings Leonardo Bras
2018-10-24 4:03 ` Leonardo Bras [this message]
2018-10-28 16:34 ` [PATCH v3 1/5] x86/vdso: Renames variable to fix shadow warning Masahiro Yamada
2018-10-24 4:03 ` [PATCH v3 2/5] kbuild: Removes unnecessary shadowed local variable Leonardo Bras
2018-10-28 16:36 ` Masahiro Yamada
2018-10-30 0:31 ` Leonardo Bras
2018-10-24 4:03 ` [PATCH v3 3/5] Creates macro to avoid variable shadowing Leonardo Bras
2018-10-24 4:03 ` [PATCH v3 4/5] modpost: Changes parameter name to avoid shadowing Leonardo Bras
2018-10-28 16:42 ` Masahiro Yamada
2018-10-31 23:24 ` Leonardo Bras
2018-11-01 3:31 ` Leonardo Bras
2018-10-24 4:03 ` [PATCH v3 5/5] Adds -Wshadow on KBUILD_HOSTCFLAGS Leonardo Bras
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=20181024040354.24879-2-leobras.c@gmail.com \
--to=leobras.c@gmail.com \
--cc=David.Laight@aculab.com \
--cc=bp@alien8.de \
--cc=helen@koikeco.de \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkcamp@lists.libreplanetbr.org \
--cc=luto@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=mingo@kernel.org \
--cc=yamada.masahiro@socionext.com \
/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).