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

nmp-object/trivial: move code

Browse Source
This commit is contained in:
Thomas Haller
2015-10-12 13:32:20 +02:00
parent 250b1293f3
commit 0fd3c4e24c
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -522,6 +522,18 @@ nmp_object_copy (NMPObject *dst, const NMPObject *src, gboolean id_only)
} }
} }
static void
_vt_cmd_obj_copy_link (NMPObject *dst, const NMPObject *src)
{
if (dst->_link.udev.device != src->_link.udev.device) {
if (dst->_link.udev.device)
g_object_unref (dst->_link.udev.device);
if (src->_link.udev.device)
g_object_ref (src->_link.udev.device);
}
dst->_link = src->_link;
}
#define _vt_cmd_plobj_id_copy(type, plat_type, cmd) \ #define _vt_cmd_plobj_id_copy(type, plat_type, cmd) \
static void \ static void \
_vt_cmd_plobj_id_copy_##type (NMPlatformObject *_dst, const NMPlatformObject *_src) \ _vt_cmd_plobj_id_copy_##type (NMPlatformObject *_dst, const NMPlatformObject *_src) \
@@ -556,18 +568,6 @@ _vt_cmd_plobj_id_copy (ip6_route, NMPlatformIP6Route, {
dst->network = src->network; dst->network = src->network;
}); });
static void
_vt_cmd_obj_copy_link (NMPObject *dst, const NMPObject *src)
{
if (dst->_link.udev.device != src->_link.udev.device) {
if (dst->_link.udev.device)
g_object_unref (dst->_link.udev.device);
if (src->_link.udev.device)
g_object_ref (src->_link.udev.device);
}
dst->_link = src->_link;
}
/* Uses internally nmp_object_copy(), hence it also violates the const /* Uses internally nmp_object_copy(), hence it also violates the const
* promise for @obj. * promise for @obj.
* */ * */