summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-02-07 19:23:17 +0000
committerLubomir Rintel <lkundrak@v3.sk>2018-02-08 17:11:46 +0100
commit411e72b3c9f95082751e9b65efd25d7f194501fc (patch)
treefbd4b23c13c4557748707604983dd93355ccc2ba
parent7f7207f36bc16cd5dc4550b6307efd72c9d623ee (diff)
downloadNetworkManager-411e72b3c9f95082751e9b65efd25d7f194501fc.tar.gz
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.
-rw-r--r--shared/nm-utils/nm-dedup-multi.c4
-rw-r--r--shared/nm-utils/nm-dedup-multi.h2
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);