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

platform: use struct initializer instead of memset()

Browse Source 
I think this is preferred over memset(), because it allows the
compiler to better unstand what is happening.

Also, strictly speaking in the C language, %NULL pointers are not
guaranteed to have an all zero bit pattern. Of course, that is already
required on any architecture where NetworkManager is running.
This commit is contained in:
Thomas Haller
2018-12-13 11:08:32 +01:00
parent 67f02b2a14
commit 8b9fd01ef3
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform/nm-linux-platform.c
View File

@@ -1942,9 +1942,10 @@ _wireguard_update_from_allowed_ips_nla (NMPWireGuardAllowedIP *allowed_ip,
_check_addr_or_return_val (tb, WGALLOWEDIP_A_IPADDR, addr_len, FALSE); _check_addr_or_return_val (tb, WGALLOWEDIP_A_IPADDR, addr_len, FALSE);
memset (allowed_ip, 0, sizeof (NMPWireGuardAllowedIP)); *allowed_ip = (NMPWireGuardAllowedIP) {
.family = family,
};
allowed_ip->family = family;
nm_assert ((int) allowed_ip->family == family); nm_assert ((int) allowed_ip->family == family);
if (tb[WGALLOWEDIP_A_IPADDR]) if (tb[WGALLOWEDIP_A_IPADDR])

18
src/platform/nmp-object.c
View File

@@ -630,9 +630,12 @@ _nmp_object_stackinit_from_class (NMPObject *obj, const NMPClass *klass)
nm_assert (obj); nm_assert (obj);
nm_assert (klass); nm_assert (klass);
memset (obj, 0, sizeof (NMPObject)); *obj = (NMPObject) {
obj->_class = klass; .parent = {
obj->parent._ref_count = NM_OBJ_REF_COUNT_STACKINIT; .klass = (const NMDedupMultiObjClass *) klass,
._ref_count = NM_OBJ_REF_COUNT_STACKINIT,
},
};
} }
static NMPObject * static NMPObject *
@@ -644,9 +647,12 @@ _nmp_object_stackinit_from_type (NMPObject *obj, NMPObjectType obj_type)
klass = nmp_class_from_type (obj_type); klass = nmp_class_from_type (obj_type);
nm_assert (klass); nm_assert (klass);
memset (obj, 0, sizeof (NMPObject)); *obj = (NMPObject) {
obj->_class = klass; .parent = {
obj->parent._ref_count = NM_OBJ_REF_COUNT_STACKINIT; .klass = (const NMDedupMultiObjClass *) klass,
._ref_count = NM_OBJ_REF_COUNT_STACKINIT,
},
};
return obj; return obj;
} }