On 27.07.2023 12:47, Nicola Vetrini wrote: > Rule 5.3 has the following headline: > "An identifier declared in an inner scope shall not hide an > identifier declared in an outer scope" > > The renames done by this patch avoid shadowing from happening. > They are as follows: > - s/str/s/ in 'lapic_disable' > - s/str/level/ in '(apic|mce)_set_verbosity' > - s/str/state_str/ in 'mwait_idle_probe' > - s/str/memmap_name/ in 'init_e820'
I'm sorry to say that, but I'm not willing to go and figure out where that "str" is that there's supposedly a collision with. Please can you state such right here, ... > - s/i/j/ in 'mce_action' (the shadowing here is due to macro > 'x86_mcinfo_lookup' that defines 'i' as a loop counter) ... much like you do in this case? > - s/desc/descriptor/ in '_hvm_load_entry' > - s/socket_info/sock_info/ in 'do_write_psr_msrs' (I didn't look at any of these in any detail, partly because again I hope for additional context before doing so.) > - s/debug_stack_lines/dbg_stack_lines/ in 'compat_show_guest_stack' This wants doing differently: The two functions originally lived in different source files, so passing the static variable as argument was preferred over making the variable non-static. When the function was moved, that aspect was overlooked. The function argument simply wants dropping. Jan