Adds -Wshadow on KBUILD_HOSTCFLAGS and fix warnings

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 <[email protected]>

---
 arch/x86/entry/vdso/vdso2c.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

arch/x86/entry/vdso/vdso2c.h +7 -7

index fa847a620f40..a20b134de2a8 100644
@@ -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

Removes an unnecessary shadowed local variable (start). It was used only once, with the same value it was started before the if block.

Signed-off-by Leonardo Bras <[email protected]>

---
 scripts/asn1_compiler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

scripts/asn1_compiler.c +1 -2

index c146020fc783..1b28787028d3 100644
@@ -413,7 +413,7 @@ static void tokenise(char *buffer, char *end)
 
                        /* Handle string tokens */
                        if (isalpha(*p)) {
-                               const char **dir, *start = p;
+                               const char **dir;
 
                                /* Can be a directive, type name or element
                                 * name.  Find the end of the name.
--

2.19.1

Quoted 6 lines · Leonardo Bras

Removes an unnecessary shadowed local variable (start). It was used only once, with the same value it was started before the if block.

Signed-off-by Leonardo Bras <[email protected]>

Applied to linux-kbuild
with some fixups in the subject.

Please do not add a period to the end of the subject.

Quoted 18 lines

---
 scripts/asn1_compiler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

scripts/asn1_compiler.c +1 -2

index c146020fc783..1b28787028d3 100644
@@ -413,7 +413,7 @@ static void tokenise(char *buffer, char *end)
 
                        /* Handle string tokens */
                        if (isalpha(*p)) {
-                               const char **dir, *start = p;
+                               const char **dir;
 
                                /* Can be a directive, type name or element
                                 * name.  Find the end of the name.
--

Quoted 2 lines

2.19.1

--
Best Regards
Masahiro Yamada

Changes the parameter name to avoid shadowing a variable.

Signed-off-by Leonardo Bras <[email protected]>

---
 scripts/mod/modpost.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

scripts/mod/modpost.c +2 -3

index 0d998c54564d..368fe42340df 100644
@@ -2228,13 +2228,13 @@ static int add_versions(struct buffer *b, struct module *mod)
 }
 
 static void add_depends(struct buffer *b, struct module *mod,
-                       struct module *modules)
+                       struct module *module_list)
 {
        struct symbol *s;
        struct module *m;
        int first = 1;
 
-       for (m = modules; m; m = m->next)
+       for (m = module_list; m; m = m->next)
                m->seen = is_vmlinux(m->name);
 
        buf_printf(b, "\n");
--

2.19.1

Quoted 3 lines · Leonardo Bras

Changes the parameter name to avoid shadowing a variable.

Signed-off-by Leonardo Bras <[email protected]>

For this one, I'd rather like to see code refactoring than renaming the variable.

I will take a closer look.

Em seg, 2018-10-29 às 01:42 +0900, Masahiro Yamada escreveu:

Quoted 9 lines

Quoted 3 lines · Leonardo Bras

Changes the parameter name to avoid shadowing a variable.

Signed-off-by Leonardo Bras <[email protected]>

For this one, I'd rather like to see code refactoring than renaming the variable.

Quoted 1 line

I will take a closer look.

What do you suggest to refactor?
I volunteer for this work.

Leonardo Bras