diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-03-18 08:08:04 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-03-25 09:12:32 +0100 |
| commit | d178c2572844ef689909da07dc193a7dfab406d6 (patch) | |
| tree | 31951330a1560d79fbabdaf45631f0c950f4a989 /libnm-core/nm-core-internal.h | |
| parent | 25ef45ff3debe7d3df526f7727401116b4f3252e (diff) | |
| download | NetworkManager-d178c2572844ef689909da07dc193a7dfab406d6.tar.gz | |
libnm,cli: move cleanup macros to "shared/nm-libnm-core-utils.h"
Diffstat (limited to 'libnm-core/nm-core-internal.h')
| -rw-r--r-- | libnm-core/nm-core-internal.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index cf2be4a24d..9b123131ef 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -88,6 +88,7 @@ #include "nm-utils.h" #include "nm-vpn-dbus-interface.h" #include "nm-vpn-editor-plugin.h" +#include "nm-libnm-core-utils.h" /* IEEE 802.1D-1998 timer values */ #define NM_BR_MIN_HELLO_TIME 1 @@ -264,14 +265,6 @@ GHashTable *_nm_ip_route_get_attributes_direct (NMIPRoute *route); NMSriovVF *_nm_utils_sriov_vf_from_strparts (const char *index, const char *detail, gboolean ignore_unknown, GError **error); gboolean _nm_sriov_vf_attribute_validate_all (const NMSriovVF *vf, GError **error); -static inline void -_nm_auto_ip_route_unref (NMIPRoute **v) -{ - if (*v) - nm_ip_route_unref (*v); -} -#define nm_auto_ip_route_unref nm_auto (_nm_auto_ip_route_unref) - GPtrArray *_nm_utils_copy_array (const GPtrArray *array, NMUtilsCopyFunc copy_func, GDestroyNotify free_func); @@ -763,9 +756,6 @@ gboolean _nm_connection_find_secret (NMConnection *self, /*****************************************************************************/ -#define nm_auto_unref_wgpeer nm_auto(_nm_auto_unref_wgpeer) -NM_AUTO_DEFINE_FCN0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref) - gboolean nm_utils_base64secret_normalize (const char *base64_key, gsize required_key_len, char **out_base64_key_norm); |