diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-01-11 14:34:53 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-01-31 14:52:49 +0100 |
| commit | a13d0102c1dfa4ca7f0042ccc895f154acf36f2e (patch) | |
| tree | bcc52f01395fa3cc6bf87c72f14a9336c8e075f2 /src | |
| parent | ba53d2c29fe03da93c2a3316d4286a543aeef79e (diff) | |
kernel-device-generic: fix warnings with -Wshadow
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];
| ^~~~~~~~~~
Diffstat (limited to 'src')
| -rw-r--r-- | src/kerneldevice/mm-kernel-device-generic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kerneldevice/mm-kernel-device-generic.c b/src/kerneldevice/mm-kernel-device-generic.c index d58f96f6..c32831d7 100644 --- a/src/kerneldevice/mm-kernel-device-generic.c +++ b/src/kerneldevice/mm-kernel-device-generic.c @@ -952,29 +952,29 @@ kernel_device_get_property_as_int_hex (MMKernelDevice *self, /*****************************************************************************/ MMKernelDevice * -mm_kernel_device_generic_new_with_rules (MMKernelEventProperties *properties, +mm_kernel_device_generic_new_with_rules (MMKernelEventProperties *props, GArray *rules, 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 */ return MM_KERNEL_DEVICE (g_initable_new (MM_TYPE_KERNEL_DEVICE_GENERIC, NULL, error, - "properties", properties, + "properties", props, "rules", rules, NULL)); } MMKernelDevice * -mm_kernel_device_generic_new (MMKernelEventProperties *properties, +mm_kernel_device_generic_new (MMKernelEventProperties *props, GError **error) { 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 */ if (G_UNLIKELY (!rules)) { @@ -983,7 +983,7 @@ mm_kernel_device_generic_new (MMKernelEventProperties *properties, return NULL; } - return mm_kernel_device_generic_new_with_rules (properties, rules, error); + return mm_kernel_device_generic_new_with_rules (props, rules, error); } /*****************************************************************************/ |