x86/vdso: Renames variable to fix shadow warning.
Subsystems (4)
PATCH v2 1/5 x86/vdso: Renames variable to fix shadow warning.
Renames the char variable to avoid shadowing a variable previously declared on this function.
--- arch/x86/entry/vdso/vdso2c.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/x86/entry/vdso/vdso2c.h +7 -6
@@ -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) {
Signature · 1 line
2.19.1
Quoted 6 lines · Leonardo Brás
Renames the char variable to avoid shadowing a variable previously declared on this function.
How about “The go32() and go64() functions has an argument and a local variable called ‘name’. Rename both to clarify the code and to fix a warning with -Wshadow.”
Other than that, Acked-by: Andy Lutomirski <[email protected]>
Ingo or Thomas, it probably makes sense to just apply this to tip:x86/vdso, since it’s an improvement regardless of the fate of the rest of the series.
Hello Andy,
Yeah, it's much better. I will replace this part of the commit message. It will be fixed for v3.
Thank you!
Quoted 3 lines · Andy Lutomirski
How about “The
go32()andgo64()functions has an argument and a local variable called ‘name’. Rename both to clarify the code and to fix a warning with -Wshadow.”Other than that, Acked-by: Andy Lutomirski <[email protected]