diff options
Diffstat (limited to 'shared/nm-utils')
| -rw-r--r-- | shared/nm-utils/nm-dedup-multi.c | 4 | ||||
| -rw-r--r-- | shared/nm-utils/nm-dedup-multi.h | 2 | ||||
| -rw-r--r-- | shared/nm-utils/nm-udev-utils.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/shared/nm-utils/nm-dedup-multi.c b/shared/nm-utils/nm-dedup-multi.c index ee310a7b..59b647ed 100644 --- a/shared/nm-utils/nm-dedup-multi.c +++ b/shared/nm-utils/nm-dedup-multi.c @@ -877,7 +877,7 @@ nm_dedup_multi_index_obj_intern (NMDedupMultiIndex *self, return obj_new; } -const NMDedupMultiObj * +void nm_dedup_multi_obj_unref (const NMDedupMultiObj *obj) { if (obj) { @@ -899,8 +899,6 @@ again: obj->klass->obj_destroy ((NMDedupMultiObj *) obj); } } - - return NULL; } gboolean diff --git a/shared/nm-utils/nm-dedup-multi.h b/shared/nm-utils/nm-dedup-multi.h index bebfe43d..6286d6a4 100644 --- a/shared/nm-utils/nm-dedup-multi.h +++ b/shared/nm-utils/nm-dedup-multi.h @@ -97,7 +97,7 @@ nm_dedup_multi_obj_ref (const NMDedupMultiObj *obj) return obj; } -const NMDedupMultiObj *nm_dedup_multi_obj_unref (const NMDedupMultiObj *obj); +void nm_dedup_multi_obj_unref (const NMDedupMultiObj *obj); const NMDedupMultiObj *nm_dedup_multi_obj_clone (const NMDedupMultiObj *obj); gboolean nm_dedup_multi_obj_needs_clone (const NMDedupMultiObj *obj); diff --git a/shared/nm-utils/nm-udev-utils.c b/shared/nm-utils/nm-udev-utils.c index 79d4426d..709f7590 100644 --- a/shared/nm-utils/nm-udev-utils.c +++ b/shared/nm-utils/nm-udev-utils.c @@ -257,7 +257,7 @@ nm_udev_client_new (const char *const*subsystems, channel = g_io_channel_unix_new (udev_monitor_get_fd (self->monitor)); self->watch_source = g_io_create_watch (channel, G_IO_IN); g_io_channel_unref (channel); - g_source_set_callback (self->watch_source, (GSourceFunc) monitor_event, self, NULL); + g_source_set_callback (self->watch_source, (GSourceFunc)(void (*) (void)) monitor_event, self, NULL); g_source_attach (self->watch_source, g_main_context_get_thread_default ()); g_source_unref (self->watch_source); } |