colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glib-aux: use struct initialization in nm_dedup_multi_index_new()

Browse Source
This commit is contained in:
Thomas Haller
2022-12-20 14:21:08 +01:00
parent f1874e6790
commit 5d81b472dc
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libnm-glib-aux/nm-dedup-multi.c
View File

@@ -1004,12 +1004,14 @@ nm_dedup_multi_index_new(void)
{ {
NMDedupMultiIndex *self; NMDedupMultiIndex *self;
self = g_slice_new0(NMDedupMultiIndex); self = g_slice_new(NMDedupMultiIndex);
self->ref_count = 1; *self = (NMDedupMultiIndex){
self->idx_entries = .ref_count = 1,
g_hash_table_new((GHashFunc) _dict_idx_entries_hash, (GEqualFunc) _dict_idx_entries_equal); .idx_entries = g_hash_table_new((GHashFunc) _dict_idx_entries_hash,
self->idx_objs = (GEqualFunc) _dict_idx_entries_equal),
g_hash_table_new((GHashFunc) _dict_idx_objs_hash, (GEqualFunc) _dict_idx_objs_equal); .idx_objs =
g_hash_table_new((GHashFunc) _dict_idx_objs_hash, (GEqualFunc) _dict_idx_objs_equal),
};
return self; 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, NULL);
g_return_val_if_fail(self->ref_count > 0, NULL); g_return_val_if_fail(self->ref_count > 0, NULL);
nm_assert(self->ref_count < G_MAXINT32);
self->ref_count++; self->ref_count++;
return self; return self;