From aafc1dbe4712c86189bbc1d4d54ad8cb4c69be7e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 5 Oct 2020 22:27:18 +0200 Subject: New upstream version 1.27.90 --- libnm-core/nm-utils-private.h | 73 +++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 45 deletions(-) (limited to 'libnm-core/nm-utils-private.h') diff --git a/libnm-core/nm-utils-private.h b/libnm-core/nm-utils-private.h index dd3785be..dc2a6d29 100644 --- a/libnm-core/nm-utils-private.h +++ b/libnm-core/nm-utils-private.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2005 - 2017 Red Hat, Inc. */ @@ -6,44 +6,29 @@ #ifndef __NM_UTILS_PRIVATE_H__ #define __NM_UTILS_PRIVATE_H__ -#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE) -#error Cannot use this header. +#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE) + #error Cannot use this header. #endif #include "nm-setting-private.h" #include "nm-setting-ip-config.h" -struct _NMVariantAttributeSpec { - char *name; - const GVariantType *type; - bool v4:1; - bool v6:1; - bool no_value:1; - bool consumes_rest:1; - char str_type; -}; - #define NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(_name, _type, ...) \ - (&((const NMVariantAttributeSpec) { \ - .name = _name, \ - .type = _type, \ - __VA_ARGS__ \ - })) - -gboolean _nm_utils_string_slist_validate (GSList *list, - const char **valid_values); - -gboolean _nm_utils_secret_flags_validate (NMSettingSecretFlags secret_flags, - const char *setting_name, - const char *property_name, - NMSettingSecretFlags disallowed_flags, - GError **error); - -gboolean _nm_utils_wps_method_validate (NMSettingWirelessSecurityWpsMethod wps_method, - const char *setting_name, - const char *property_name, - gboolean wps_required, - GError **error); + (&((const NMVariantAttributeSpec){.name = _name, .type = _type, __VA_ARGS__})) + +gboolean _nm_utils_string_slist_validate(GSList *list, const char **valid_values); + +gboolean _nm_utils_secret_flags_validate(NMSettingSecretFlags secret_flags, + const char * setting_name, + const char * property_name, + NMSettingSecretFlags disallowed_flags, + GError ** error); + +gboolean _nm_utils_wps_method_validate(NMSettingWirelessSecurityWpsMethod wps_method, + const char * setting_name, + const char * property_name, + gboolean wps_required, + GError ** error); /* D-Bus transform funcs */ @@ -57,22 +42,20 @@ extern const NMSettInfoPropertType nm_sett_info_propert_type_assigned_mac_addres extern const NMSettInfoPropertType nm_sett_info_propert_type_bridge_vlans; -void _nm_utils_strdict_from_dbus (GVariant *dbus_value, - GValue *prop_value); +void _nm_utils_strdict_from_dbus(GVariant *dbus_value, GValue *prop_value); -void _nm_utils_bytes_from_dbus (GVariant *dbus_value, - GValue *prop_value); +void _nm_utils_bytes_from_dbus(GVariant *dbus_value, GValue *prop_value); -char * _nm_utils_hwaddr_canonical_or_invalid (const char *mac, gssize length); +char *_nm_utils_hwaddr_canonical_or_invalid(const char *mac, gssize length); -gboolean _nm_utils_hwaddr_link_local_valid (const char *mac); +gboolean _nm_utils_hwaddr_link_local_valid(const char *mac); -gboolean _nm_sriov_vf_parse_vlans (NMSriovVF *vf, const char *str, GError **error); +gboolean _nm_sriov_vf_parse_vlans(NMSriovVF *vf, const char *str, GError **error); -gboolean _nm_utils_bridge_vlan_verify_list (GPtrArray *vlans, - gboolean check_normalizable, - GError **error, - const char *setting, - const char *property); +gboolean _nm_utils_bridge_vlan_verify_list(GPtrArray * vlans, + gboolean check_normalizable, + GError ** error, + const char *setting, + const char *property); #endif -- cgit 1.3.0-6-gf8a5