diff options
author | Thomas Haller <thaller@redhat.com> | 2022-03-29 17:18:44 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2022-05-03 10:03:27 +0200 |
commit | e047833d5862943c10733b27511dbf4e3828f68a (patch) | |
tree | 01c8a3dfb2f5158832d4421c7244aaa984c17acf | |
parent | 6fd01a78c4d61c6ac5a413280121036e6a57b23c (diff) |
platform: avoid duplicated code in _nmp_object_stackinit_from_type()
(cherry picked from commit 3bd5d2bca9bba663004287e402613de32bb62bae)
-rw-r--r-- | src/libnm-platform/nmp-object.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/libnm-platform/nmp-object.c b/src/libnm-platform/nmp-object.c index 0102e943ff..2ae25c2137 100644 --- a/src/libnm-platform/nmp-object.c +++ b/src/libnm-platform/nmp-object.c @@ -799,7 +799,7 @@ nmp_object_new_link(int ifindex) /*****************************************************************************/ -static void +static NMPObject * _nmp_object_stackinit_from_class(NMPObject *obj, const NMPClass *klass) { nm_assert(obj); @@ -812,25 +812,13 @@ _nmp_object_stackinit_from_class(NMPObject *obj, const NMPClass *klass) ._ref_count = NM_OBJ_REF_COUNT_STACKINIT, }, }; + return obj; } static NMPObject * _nmp_object_stackinit_from_type(NMPObject *obj, NMPObjectType obj_type) { - const NMPClass *klass; - - nm_assert(obj); - klass = nmp_class_from_type(obj_type); - nm_assert(klass); - - *obj = (NMPObject){ - .parent = - { - .klass = (const NMDedupMultiObjClass *) klass, - ._ref_count = NM_OBJ_REF_COUNT_STACKINIT, - }, - }; - return obj; + return _nmp_object_stackinit_from_class(obj, nmp_class_from_type(obj_type)); } const NMPObject * |