diff options
author | Thomas Haller <thaller@redhat.com> | 2022-12-20 14:21:08 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2023-01-17 16:26:51 +0100 |
commit | 5d81b472dca61a13a5c7bb555536500e80d8478c (patch) | |
tree | f93f38ab9635238b94500118fbcda3b695c88388 | |
parent | f1874e67901fef0054b73afc9de3d7935bae99ce (diff) |
glib-aux: use struct initialization in nm_dedup_multi_index_new()
-rw-r--r-- | src/libnm-glib-aux/nm-dedup-multi.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/libnm-glib-aux/nm-dedup-multi.c b/src/libnm-glib-aux/nm-dedup-multi.c index 7d451d0d35..625c4ef31e 100644 --- a/src/libnm-glib-aux/nm-dedup-multi.c +++ b/src/libnm-glib-aux/nm-dedup-multi.c @@ -1004,12 +1004,14 @@ nm_dedup_multi_index_new(void) { NMDedupMultiIndex *self; - self = g_slice_new0(NMDedupMultiIndex); - self->ref_count = 1; - self->idx_entries = - g_hash_table_new((GHashFunc) _dict_idx_entries_hash, (GEqualFunc) _dict_idx_entries_equal); - self->idx_objs = - g_hash_table_new((GHashFunc) _dict_idx_objs_hash, (GEqualFunc) _dict_idx_objs_equal); + self = g_slice_new(NMDedupMultiIndex); + *self = (NMDedupMultiIndex){ + .ref_count = 1, + .idx_entries = g_hash_table_new((GHashFunc) _dict_idx_entries_hash, + (GEqualFunc) _dict_idx_entries_equal), + .idx_objs = + g_hash_table_new((GHashFunc) _dict_idx_objs_hash, (GEqualFunc) _dict_idx_objs_equal), + }; return self; } @@ -1018,6 +1020,7 @@ nm_dedup_multi_index_ref(NMDedupMultiIndex *self) { g_return_val_if_fail(self, NULL); g_return_val_if_fail(self->ref_count > 0, NULL); + nm_assert(self->ref_count < G_MAXINT32); self->ref_count++; return self; |