Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2fce819 authored by Mark Rustad's avatar Mark Rustad Committed by Matt Fleming
Browse files

efi: Resolve some shadow warnings 



It is a really bad idea to declare variables or parameters that
have the same name as common types. It is valid C, but it gets
surprising if a macro expansion attempts to declare an inner
local with that type. Change the local names to eliminate the
hazard.

Change s16 => str16, s8 => str8.

This resolves warnings seen when using W=2 during make, for instance:

drivers/firmware/efi/vars.c: In function ‘dup_variable_bug’:
drivers/firmware/efi/vars.c:324:44: warning: declaration of ‘s16’ shadows a global declaration [-Wshadow]
 static void dup_variable_bug(efi_char16_t *s16, efi_guid_t *vendor_guid,

drivers/firmware/efi/vars.c:328:8: warning: declaration of ‘s8’ shadows a global declaration [-Wshadow]
  char *s8;

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 65ba758f

drivers/firmware/efi/vars.c

+7 −7
Original line number Diff line number Diff line
@@ -321,11 +321,11 @@ static unsigned long var_name_strnsize(efi_char16_t *variable_name, 
 * Print a warning when duplicate EFI variables are encountered and

 * disable the sysfs workqueue since the firmware is buggy.

 */

static void dup_variable_bug(efi_char16_t *s16, efi_guid_t *vendor_guid,

static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid,

			     unsigned long len16)

{

	size_t i, len8 = len16 / sizeof(efi_char16_t);

	char *s8;

	char *str8;



	/*

	 * Disable the workqueue since the algorithm it uses for
@@ -334,16 +334,16 @@ static void dup_variable_bug(efi_char16_t *s16, efi_guid_t *vendor_guid, 
	 */

	efivar_wq_enabled = false;



	s8 = kzalloc(len8, GFP_KERNEL);

	if (!s8)

	str8 = kzalloc(len8, GFP_KERNEL);

	if (!str8)

		return;



	for (i = 0; i < len8; i++)

		s8[i] = s16[i];

		str8[i] = str16[i];



	printk(KERN_WARNING "efivars: duplicate variable: %s-%pUl\n",

	       s8, vendor_guid);

	kfree(s8);

	       str8, vendor_guid);

	kfree(str8);

}



/**