diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-12-13 11:08:32 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-12-19 08:58:12 +0100 |
| commit | 8b9fd01ef355d78dab9eb4c3811d56bcf2e749b8 (patch) | |
| tree | f709b5ea10e205022f81dfb313d882381a39c8d9 | |
| parent | 67f02b2a1419ad1144b197a6448282833c4fa5c5 (diff) | |
| download | NetworkManager-8b9fd01ef355d78dab9eb4c3811d56bcf2e749b8.tar.gz | |
platform: use struct initializer instead of memset()
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.
| -rw-r--r-- | src/platform/nm-linux-platform.c | 5 | ||||
| -rw-r--r-- | src/platform/nmp-object.c | 18 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 8b4b081f64..008a3bc973 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -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); - memset (allowed_ip, 0, sizeof (NMPWireGuardAllowedIP)); + *allowed_ip = (NMPWireGuardAllowedIP) { + .family = family, + }; - allowed_ip->family = family; nm_assert ((int) allowed_ip->family == family); if (tb[WGALLOWEDIP_A_IPADDR]) diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index fd505282e2..1218b5a224 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -630,9 +630,12 @@ _nmp_object_stackinit_from_class (NMPObject *obj, const NMPClass *klass) nm_assert (obj); nm_assert (klass); - memset (obj, 0, sizeof (NMPObject)); - obj->_class = klass; - obj->parent._ref_count = NM_OBJ_REF_COUNT_STACKINIT; + *obj = (NMPObject) { + .parent = { + .klass = (const NMDedupMultiObjClass *) klass, + ._ref_count = NM_OBJ_REF_COUNT_STACKINIT, + }, + }; } static NMPObject * @@ -644,9 +647,12 @@ _nmp_object_stackinit_from_type (NMPObject *obj, NMPObjectType obj_type) klass = nmp_class_from_type (obj_type); nm_assert (klass); - memset (obj, 0, sizeof (NMPObject)); - obj->_class = klass; - obj->parent._ref_count = NM_OBJ_REF_COUNT_STACKINIT; + *obj = (NMPObject) { + .parent = { + .klass = (const NMDedupMultiObjClass *) klass, + ._ref_count = NM_OBJ_REF_COUNT_STACKINIT, + }, + }; return obj; } |