From 411e72b3c9f95082751e9b65efd25d7f194501fc Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 7 Feb 2018 19:23:17 +0000 Subject: [PATCH] shared/utils/dedup-multi: make nm_dedup_multi_obj_unref() return void This makes its prototype compatible with GDestroyNotify so that GCC 8.0 won't warn. The return value is not used anywhere and the unref() functions typically don't return any. --- shared/nm-utils/nm-dedup-multi.c | 4 +--- shared/nm-utils/nm-dedup-multi.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/shared/nm-utils/nm-dedup-multi.c b/shared/nm-utils/nm-dedup-multi.c index a0944f4699..fc134e2500 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 bebfe43d32..6286d6a4c3 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);