colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel-device-generic: fix warnings with -Wshadow

Browse Source 
kerneldevice/mm-kernel-device-generic.c: In function ‘mm_kernel_device_generic_new_with_rules’:
  kerneldevice/mm-kernel-device-generic.c:954:68: error: declaration of ‘properties’ shadows a global declaration [-Werror=shadow]
    954 | mm_kernel_device_generic_new_with_rules (MMKernelEventProperties  *properties,
        |                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~
  kerneldevice/mm-kernel-device-generic.c:46:20: note: shadowed declaration is here
     46 | static GParamSpec *properties[PROP_LAST];
        |                    ^~~~~~~~~~
  kerneldevice/mm-kernel-device-generic.c: In function ‘mm_kernel_device_generic_new’:
  kerneldevice/mm-kernel-device-generic.c:971:57: error: declaration of ‘properties’ shadows a global declaration [-Werror=shadow]
    971 | mm_kernel_device_generic_new (MMKernelEventProperties  *properties,
        |                               ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~
  kerneldevice/mm-kernel-device-generic.c:46:20: note: shadowed declaration is here
     46 | static GParamSpec *properties[PROP_LAST];
        |                    ^~~~~~~~~~
This commit is contained in:
Aleksander Morgado
2020-01-11 14:34:53 +01:00
parent ba53d2c29f
commit a13d0102c1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/kerneldevice/mm-kernel-device-generic.c
View File

@@ -952,29 +952,29 @@ kernel_device_get_property_as_int_hex (MMKernelDevice *self,
/*****************************************************************************/ /*****************************************************************************/
MMKernelDevice * MMKernelDevice *
mm_kernel_device_generic_new_with_rules (MMKernelEventProperties *properties, mm_kernel_device_generic_new_with_rules (MMKernelEventProperties *props,
GArray *rules, GArray *rules,
GError **error) GError **error)
{ {
g_return_val_if_fail (MM_IS_KERNEL_EVENT_PROPERTIES (properties), NULL); g_return_val_if_fail (MM_IS_KERNEL_EVENT_PROPERTIES (props), NULL);
/* Note: we allow NULL rules, e.g. for virtual devices */ /* Note: we allow NULL rules, e.g. for virtual devices */
return MM_KERNEL_DEVICE (g_initable_new (MM_TYPE_KERNEL_DEVICE_GENERIC, return MM_KERNEL_DEVICE (g_initable_new (MM_TYPE_KERNEL_DEVICE_GENERIC,
NULL, NULL,
error, error,
"properties", properties, "properties", props,
"rules", rules, "rules", rules,
NULL)); NULL));
} }
MMKernelDevice * MMKernelDevice *
mm_kernel_device_generic_new (MMKernelEventProperties *properties, mm_kernel_device_generic_new (MMKernelEventProperties *props,
GError **error) GError **error)
{ {
static GArray *rules = NULL; static GArray *rules = NULL;
g_return_val_if_fail (MM_IS_KERNEL_EVENT_PROPERTIES (properties), NULL); g_return_val_if_fail (MM_IS_KERNEL_EVENT_PROPERTIES (props), NULL);
/* We only try to load the default list of rules once */ /* We only try to load the default list of rules once */
if (G_UNLIKELY (!rules)) { if (G_UNLIKELY (!rules)) {
@@ -983,7 +983,7 @@ mm_kernel_device_generic_new (MMKernelEventProperties *properties,
return NULL; return NULL;
} }
return mm_kernel_device_generic_new_with_rules (properties, rules, error); return mm_kernel_device_generic_new_with_rules (props, rules, error);
} }
/*****************************************************************************/ /*****************************************************************************/