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

format: reformat source tree with clang-format 13.0

Browse Source 
We use clang-format for automatic formatting of our source files.
Since clang-format is actively maintained software, the actual
formatting depends on the used version of clang-format. That is
unfortunate and painful, but really unavoidable unless clang-format
would be strictly bug-compatible.

So the version that we must use is from the current Fedora release, which
is also tested by our gitlab-ci. Previously, we were using Fedora 34 with
clang-tools-extra-12.0.1-1.fc34.x86_64.

As Fedora 35 comes along, we need to update our formatting as Fedora 35
comes with version "13.0.0~rc1-1.fc35".
An alternative would be to freeze on version 12, but that has different
problems (like, it's cumbersome to rebuild clang 12 on Fedora 35 and it
would be cumbersome for our developers which are on Fedora 35 to use a
clang that they cannot easily install).

The (differently painful) solution is to reformat from time to time, as we
switch to a new Fedora (and thus clang) version.
Usually we would expect that such a reformatting brings minor changes.
But this time, the changes are huge. That is mentioned in the release
notes [1] as

  Makes PointerAligment: Right working with AlignConsecutiveDeclarations. (Fixes https://llvm.org/PR27353)

[1] https://releases.llvm.org/13.0.0/tools/clang/docs/ReleaseNotes.html#clang-format
This commit is contained in:
Thomas Haller
2021-11-09 13:28:54 +01:00
committed by Beniamino Galvani
parent e44cdc7981
commit 615221a99c
633 changed files with 21047 additions and 20964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/nm-core-utils.h
View File

@@ -261,8 +261,9 @@ _nmtst_auto_utils_host_id_context_pop(const char *const *unused)
} }
#define _NMTST_UTILS_HOST_ID_CONTEXT(uniq, host_id) \ #define _NMTST_UTILS_HOST_ID_CONTEXT(uniq, host_id) \
_nm_unused nm_auto(_nmtst_auto_utils_host_id_context_pop) \ _nm_unused nm_auto(_nmtst_auto_utils_host_id_context_pop) const char *const NM_UNIQ_T( \
const char *const NM_UNIQ_T(_host_id_context_, uniq) = ({ \ _host_id_context_, \
uniq) = ({ \
const gint64 _timestamp_ns = 1631000672; \ const gint64 _timestamp_ns = 1631000672; \
\ \
nmtst_utils_host_id_push((const guint8 *) "" host_id "", \ nmtst_utils_host_id_push((const guint8 *) "" host_id "", \

201
src/libnmc-setting/nm-meta-setting-desc.c
View File

@@ -945,7 +945,8 @@ _get_fcn_gobject_impl(const NMMetaPropertyInfo *property_info,
return NULL; return NULL;
} }
static gconstpointer _get_fcn_gobject(ARGS_GET_FCN) static gconstpointer
_get_fcn_gobject(ARGS_GET_FCN)
{ {
return _get_fcn_gobject_impl(property_info, return _get_fcn_gobject_impl(property_info,
setting, setting,
@@ -955,7 +956,8 @@ static gconstpointer _get_fcn_gobject(ARGS_GET_FCN)
out_to_free); out_to_free);
} }
static gconstpointer _get_fcn_gobject_int(ARGS_GET_FCN) static gconstpointer
_get_fcn_gobject_int(ARGS_GET_FCN)
{ {
GParamSpec *pspec; GParamSpec *pspec;
nm_auto_unset_gvalue GValue gval = G_VALUE_INIT; nm_auto_unset_gvalue GValue gval = G_VALUE_INIT;
@@ -1034,7 +1036,8 @@ static gconstpointer _get_fcn_gobject_int(ARGS_GET_FCN)
RETURN_STR_TO_FREE(return_str); RETURN_STR_TO_FREE(return_str);
} }
static gconstpointer _get_fcn_gobject_mtu(ARGS_GET_FCN) static gconstpointer
_get_fcn_gobject_mtu(ARGS_GET_FCN)
{ {
guint32 mtu; guint32 mtu;
@@ -1058,7 +1061,8 @@ static gconstpointer _get_fcn_gobject_mtu(ARGS_GET_FCN)
RETURN_STR_TO_FREE(g_strdup_printf("%u", (unsigned) mtu)); RETURN_STR_TO_FREE(g_strdup_printf("%u", (unsigned) mtu));
} }
static gconstpointer _get_fcn_gobject_secret_flags(ARGS_GET_FCN) static gconstpointer
_get_fcn_gobject_secret_flags(ARGS_GET_FCN)
{ {
guint v; guint v;
GValue val = G_VALUE_INIT; GValue val = G_VALUE_INIT;
@@ -1072,7 +1076,8 @@ static gconstpointer _get_fcn_gobject_secret_flags(ARGS_GET_FCN)
RETURN_STR_TO_FREE(secret_flags_to_string(v, get_type)); RETURN_STR_TO_FREE(secret_flags_to_string(v, get_type));
} }
static gconstpointer _get_fcn_gobject_enum(ARGS_GET_FCN) static gconstpointer
_get_fcn_gobject_enum(ARGS_GET_FCN)
{ {
GType gtype = 0; GType gtype = 0;
nm_auto_unref_gtypeclass GTypeClass *gtype_class = NULL; nm_auto_unref_gtypeclass GTypeClass *gtype_class = NULL;
@@ -1221,7 +1226,8 @@ static gconstpointer _get_fcn_gobject_enum(ARGS_GET_FCN)
/*****************************************************************************/ /*****************************************************************************/
static gboolean _set_fcn_gobject_string(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_string(ARGS_SET_FCN)
{ {
gs_free char *to_free = NULL; gs_free char *to_free = NULL;
@@ -1281,12 +1287,14 @@ _set_fcn_gobject_bool_impl(const NMMetaPropertyInfo *property_info,
return TRUE; return TRUE;
} }
static gboolean _set_fcn_gobject_bool(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_bool(ARGS_SET_FCN)
{ {
return _set_fcn_gobject_bool_impl(property_info, setting, modifier, value, error); return _set_fcn_gobject_bool_impl(property_info, setting, modifier, value, error);
} }
static gboolean _set_fcn_gobject_ternary(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_ternary(ARGS_SET_FCN)
{ {
NMTernary val; NMTernary val;
@@ -1303,7 +1311,8 @@ static gboolean _set_fcn_gobject_ternary(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_gobject_int(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_int(ARGS_SET_FCN)
{ {
int errsv; int errsv;
const GParamSpec *pspec; const GParamSpec *pspec;
@@ -1454,7 +1463,8 @@ have_value_from_nick:
return TRUE; return TRUE;
} }
static gboolean _set_fcn_gobject_mtu(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_mtu(ARGS_SET_FCN)
{ {
nm_auto_unset_gvalue GValue gval = G_VALUE_INIT; nm_auto_unset_gvalue GValue gval = G_VALUE_INIT;
const GParamSpec *pspec; const GParamSpec *pspec;
@@ -1496,7 +1506,8 @@ static gboolean _set_fcn_gobject_mtu(ARGS_SET_FCN)
#define IEEE802154_ADDR_LEN 8 #define IEEE802154_ADDR_LEN 8
#endif #endif
static gboolean _set_fcn_gobject_mac(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_mac(ARGS_SET_FCN)
{ {
NMMetaPropertyTypeMacMode mode; NMMetaPropertyTypeMacMode mode;
gboolean valid; gboolean valid;
@@ -1528,7 +1539,8 @@ static gboolean _set_fcn_gobject_mac(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_gobject_enum(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_enum(ARGS_SET_FCN)
{ {
GType gtype = 0; GType gtype = 0;
GType gtype_prop; GType gtype_prop;
@@ -1661,7 +1673,8 @@ fail:
/*****************************************************************************/ /*****************************************************************************/
static const char *const *_values_fcn_gobject_enum(ARGS_VALUES_FCN) static const char *const *
_values_fcn_gobject_enum(ARGS_VALUES_FCN)
{ {
GType gtype = 0; GType gtype = 0;
gboolean has_gtype = FALSE; gboolean has_gtype = FALSE;
@@ -1707,7 +1720,8 @@ static const char *const *_values_fcn_gobject_enum(ARGS_VALUES_FCN)
/*****************************************************************************/ /*****************************************************************************/
static const char *const *_complete_fcn_gobject_bool(ARGS_COMPLETE_FCN) static const char *const *
_complete_fcn_gobject_bool(ARGS_COMPLETE_FCN)
{ {
static const char *const v[] = { static const char *const v[] = {
"true", "true",
@@ -1726,7 +1740,8 @@ static const char *const *_complete_fcn_gobject_bool(ARGS_COMPLETE_FCN)
return v; return v;
} }
static const char *const *_complete_fcn_gobject_ternary(ARGS_COMPLETE_FCN) static const char *const *
_complete_fcn_gobject_ternary(ARGS_COMPLETE_FCN)
{ {
static const char *const v[] = { static const char *const v[] = {
"on", "on",
@@ -1748,7 +1763,8 @@ static const char *const *_complete_fcn_gobject_ternary(ARGS_COMPLETE_FCN)
return v; return v;
} }
static const char *const *_complete_fcn_gobject_devices(ARGS_COMPLETE_FCN) static const char *const *
_complete_fcn_gobject_devices(ARGS_COMPLETE_FCN)
{ {
NMDevice *const *devices = NULL; NMDevice *const *devices = NULL;
guint i, j; guint i, j;
@@ -1882,7 +1898,8 @@ _multilist_do_validate(const NMMetaPropertyInfo *property_info,
return item; return item;
} }
static gconstpointer _get_fcn_multilist(ARGS_GET_FCN) static gconstpointer
_get_fcn_multilist(ARGS_GET_FCN)
{ {
return _get_fcn_gobject_impl( return _get_fcn_gobject_impl(
property_info, property_info,
@@ -1909,7 +1926,8 @@ _multilist_clear_property(const NMMetaPropertyInfo *property_info,
return _gobject_property_reset(setting, property_info->property_name, FALSE); return _gobject_property_reset(setting, property_info->property_name, FALSE);
} }
static gboolean _set_fcn_multilist(ARGS_SET_FCN) static gboolean
_set_fcn_multilist(ARGS_SET_FCN)
{ {
gs_free const char **strv = NULL; gs_free const char **strv = NULL;
gsize i, j, nstrv; gsize i, j, nstrv;
@@ -2000,7 +2018,8 @@ static gboolean _set_fcn_multilist(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_optionlist(ARGS_SET_FCN) static gboolean
_set_fcn_optionlist(ARGS_SET_FCN)
{ {
gs_free const char **strv = NULL; gs_free const char **strv = NULL;
gs_free const char **strv_val = NULL; gs_free const char **strv_val = NULL;
@@ -2129,7 +2148,8 @@ validate_flags(NMSetting *setting, const char *prop, guint val, GError **error)
return success; return success;
} }
static gboolean _set_fcn_gobject_flags(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_flags(ARGS_SET_FCN)
{ {
unsigned long val_int; unsigned long val_int;
@@ -2149,7 +2169,8 @@ static gboolean _set_fcn_gobject_flags(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_gobject_ssid(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_ssid(ARGS_SET_FCN)
{ {
gs_unref_bytes GBytes *ssid = NULL; gs_unref_bytes GBytes *ssid = NULL;
@@ -2166,7 +2187,8 @@ static gboolean _set_fcn_gobject_ssid(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_gobject_ifname(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_ifname(ARGS_SET_FCN)
{ {
if (_SET_FCN_DO_RESET_DEFAULT(property_info, modifier, value)) if (_SET_FCN_DO_RESET_DEFAULT(property_info, modifier, value))
return _gobject_property_reset_default(setting, property_info->property_name); return _gobject_property_reset_default(setting, property_info->property_name);
@@ -2175,7 +2197,8 @@ static gboolean _set_fcn_gobject_ifname(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_vpn_service_type(ARGS_SET_FCN) static gboolean
_set_fcn_vpn_service_type(ARGS_SET_FCN)
{ {
gs_free char *service_name = NULL; gs_free char *service_name = NULL;
@@ -2187,7 +2210,8 @@ static gboolean _set_fcn_vpn_service_type(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static const char *const *_complete_fcn_vpn_service_type(ARGS_COMPLETE_FCN) static const char *const *
_complete_fcn_vpn_service_type(ARGS_COMPLETE_FCN)
{ {
gsize i, j; gsize i, j;
char **values; char **values;
@@ -2240,7 +2264,8 @@ _multilist_validate_fcn_is_ipv4_addr_or_subnet(const char *value, GError **error
return value; return value;
} }
static gboolean _set_fcn_gobject_bytes(ARGS_SET_FCN) static gboolean
_set_fcn_gobject_bytes(ARGS_SET_FCN)
{ {
gs_free char *val_strip_free = NULL; gs_free char *val_strip_free = NULL;
gs_free const char **strv = NULL; gs_free const char **strv = NULL;
@@ -2294,7 +2319,8 @@ done:
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _get_fcn_cert_8021x(ARGS_GET_FCN) static gconstpointer
_get_fcn_cert_8021x(ARGS_GET_FCN)
{ {
NMSetting8021x *s_8021X = NM_SETTING_802_1X(setting); NMSetting8021x *s_8021X = NM_SETTING_802_1X(setting);
const NMSetting8021xSchemeVtable *vtable; const NMSetting8021xSchemeVtable *vtable;
@@ -2325,7 +2351,8 @@ static gconstpointer _get_fcn_cert_8021x(ARGS_GET_FCN)
RETURN_STR_TO_FREE(str); RETURN_STR_TO_FREE(str);
} }
static gboolean _set_fcn_cert_8021x(ARGS_SET_FCN) static gboolean
_set_fcn_cert_8021x(ARGS_SET_FCN)
{ {
gs_free char *value_to_free = NULL; gs_free char *value_to_free = NULL;
NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_PATH; NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_PATH;
@@ -2383,7 +2410,8 @@ static gboolean _set_fcn_cert_8021x(ARGS_SET_FCN)
} }
} }
static const char *const *_complete_fcn_cert_8021x(ARGS_COMPLETE_FCN) static const char *const *
_complete_fcn_cert_8021x(ARGS_COMPLETE_FCN)
{ {
const NMSetting8021xSchemeVtable *vtable; const NMSetting8021xSchemeVtable *vtable;
@@ -2403,7 +2431,8 @@ static const char *const *_complete_fcn_cert_8021x(ARGS_COMPLETE_FCN)
return NULL; return NULL;
} }
static gconstpointer _get_fcn_bond_options(ARGS_GET_FCN) static gconstpointer
_get_fcn_bond_options(ARGS_GET_FCN)
{ {
NMSettingBond *s_bond = NM_SETTING_BOND(setting); NMSettingBond *s_bond = NM_SETTING_BOND(setting);
GString *str; GString *str;
@@ -2513,7 +2542,8 @@ _nm_meta_setting_bond_add_option(NMSetting * setting,
return TRUE; return TRUE;
} }
static const char *_describe_fcn_bond_options(ARGS_DESCRIBE_FCN) static const char *
_describe_fcn_bond_options(ARGS_DESCRIBE_FCN)
{ {
gs_free char *options_str = NULL; gs_free char *options_str = NULL;
const char **valid_options; const char **valid_options;
@@ -2538,12 +2568,14 @@ static const char *_describe_fcn_bond_options(ARGS_DESCRIBE_FCN)
return (*out_to_free = s); return (*out_to_free = s);
} }
static const char *const *_values_fcn_bond_options(ARGS_VALUES_FCN) static const char *const *
_values_fcn_bond_options(ARGS_VALUES_FCN)
{ {
return nm_setting_bond_get_valid_options(NULL); return nm_setting_bond_get_valid_options(NULL);
} }
static gconstpointer _get_fcn_connection_permissions(ARGS_GET_FCN) static gconstpointer
_get_fcn_connection_permissions(ARGS_GET_FCN)
{ {
NMSettingConnection *s_con = NM_SETTING_CONNECTION(setting); NMSettingConnection *s_con = NM_SETTING_CONNECTION(setting);
GString *perm = NULL; GString *perm = NULL;
@@ -2575,7 +2607,8 @@ static gconstpointer _get_fcn_connection_permissions(ARGS_GET_FCN)
return NULL; return NULL;
} }
static gboolean _set_fcn_connection_type(ARGS_SET_FCN) static gboolean
_set_fcn_connection_type(ARGS_SET_FCN)
{ {
gs_free char *uuid = NULL; gs_free char *uuid = NULL;
@@ -2603,7 +2636,8 @@ static gboolean _set_fcn_connection_type(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static const char *const *_complete_fcn_connection_type(ARGS_COMPLETE_FCN) static const char *const *
_complete_fcn_connection_type(ARGS_COMPLETE_FCN)
{ {
guint i, j; guint i, j;
char **result; char **result;
@@ -2703,7 +2737,8 @@ _multilist_remove_by_value_fcn_connection_permissions(NMSetting *setting, const
return TRUE; return TRUE;
} }
static const char *const *_complete_fcn_connection_master(ARGS_COMPLETE_FCN) static const char *const *
_complete_fcn_connection_master(ARGS_COMPLETE_FCN)
{ {
NMRemoteConnection *const *connections = NULL; NMRemoteConnection *const *connections = NULL;
guint len = 0; guint len = 0;
@@ -2776,7 +2811,8 @@ _multilist_validate2_fcn_uuid(NMSetting *setting, const char *item, GError **err
return item; return item;
} }
static gconstpointer _get_fcn_connection_metered(ARGS_GET_FCN) static gconstpointer
_get_fcn_connection_metered(ARGS_GET_FCN)
{ {
NMSettingConnection *s_conn = NM_SETTING_CONNECTION(setting); NMSettingConnection *s_conn = NM_SETTING_CONNECTION(setting);
const char *s; const char *s;
@@ -2802,7 +2838,8 @@ static gconstpointer _get_fcn_connection_metered(ARGS_GET_FCN)
return s; return s;
} }
static gboolean _set_fcn_connection_metered(ARGS_SET_FCN) static gboolean
_set_fcn_connection_metered(ARGS_SET_FCN)
{ {
NMMetered metered; NMMetered metered;
NMTernary ts_val; NMTernary ts_val;
@@ -2859,7 +2896,8 @@ dcb_flags_to_string(NMSettingDcbFlags flags)
return g_string_free(flag_str, FALSE); return g_string_free(flag_str, FALSE);
} }
static gconstpointer _get_fcn_dcb(ARGS_GET_FCN) static gconstpointer
_get_fcn_dcb(ARGS_GET_FCN)
{ {
NMSettingDcb *s_dcb = NM_SETTING_DCB(setting); NMSettingDcb *s_dcb = NM_SETTING_DCB(setting);
GString *str; GString *str;
@@ -2884,7 +2922,8 @@ static gconstpointer _get_fcn_dcb(ARGS_GET_FCN)
#define DCB_ALL_FLAGS \ #define DCB_ALL_FLAGS \
(NM_SETTING_DCB_FLAG_ENABLE | NM_SETTING_DCB_FLAG_ADVERTISE | NM_SETTING_DCB_FLAG_WILLING) (NM_SETTING_DCB_FLAG_ENABLE | NM_SETTING_DCB_FLAG_ADVERTISE | NM_SETTING_DCB_FLAG_WILLING)
static gconstpointer _get_fcn_dcb_flags(ARGS_GET_FCN) static gconstpointer
_get_fcn_dcb_flags(ARGS_GET_FCN)
{ {
nm_auto_unset_gvalue GValue val = G_VALUE_INIT; nm_auto_unset_gvalue GValue val = G_VALUE_INIT;
guint v; guint v;
@@ -2898,7 +2937,8 @@ static gconstpointer _get_fcn_dcb_flags(ARGS_GET_FCN)
RETURN_STR_TO_FREE(dcb_flags_to_string(v)); RETURN_STR_TO_FREE(dcb_flags_to_string(v));
} }
static gboolean _set_fcn_dcb_flags(ARGS_SET_FCN) static gboolean
_set_fcn_dcb_flags(ARGS_SET_FCN)
{ {
NMSettingDcbFlags flags = NM_SETTING_DCB_FLAG_NONE; NMSettingDcbFlags flags = NM_SETTING_DCB_FLAG_NONE;
long int t; long int t;
@@ -3013,7 +3053,8 @@ dcb_check_feature_enabled(const NMMetaEnvironment *environment,
} }
} }
static gboolean _set_fcn_dcb(ARGS_SET_FCN) static gboolean
_set_fcn_dcb(ARGS_SET_FCN)
{ {
guint i = 0; guint i = 0;
guint nums[8] = { guint nums[8] = {
@@ -3054,7 +3095,8 @@ static gboolean _set_fcn_dcb(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gconstpointer _get_fcn_dcb_bool(ARGS_GET_FCN) static gconstpointer
_get_fcn_dcb_bool(ARGS_GET_FCN)
{ {
NMSettingDcb *s_dcb = NM_SETTING_DCB(setting); NMSettingDcb *s_dcb = NM_SETTING_DCB(setting);
GString *str; GString *str;
@@ -3076,7 +3118,8 @@ static gconstpointer _get_fcn_dcb_bool(ARGS_GET_FCN)
RETURN_STR_TO_FREE(g_string_free(str, FALSE)); RETURN_STR_TO_FREE(g_string_free(str, FALSE));
} }
static gboolean _set_fcn_dcb_bool(ARGS_SET_FCN) static gboolean
_set_fcn_dcb_bool(ARGS_SET_FCN)
{ {
guint i = 0; guint i = 0;
guint nums[8] = { guint nums[8] = {
@@ -3105,7 +3148,8 @@ static gboolean _set_fcn_dcb_bool(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_gsm_auto_config(ARGS_SET_FCN) static gboolean
_set_fcn_gsm_auto_config(ARGS_SET_FCN)
{ {
if (!_set_fcn_gobject_bool_impl(property_info, setting, modifier, value, error)) if (!_set_fcn_gobject_bool_impl(property_info, setting, modifier, value, error))
return FALSE; return FALSE;
@@ -3127,7 +3171,8 @@ static gboolean _set_fcn_gsm_auto_config(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_gsm_sim_operator_id(ARGS_SET_FCN) static gboolean
_set_fcn_gsm_sim_operator_id(ARGS_SET_FCN)
{ {
const char *p = value; const char *p = value;
@@ -3152,7 +3197,8 @@ static gboolean _set_fcn_gsm_sim_operator_id(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_infiniband_p_key(ARGS_SET_FCN) static gboolean
_set_fcn_infiniband_p_key(ARGS_SET_FCN)
{ {
gint64 p_key; gint64 p_key;
@@ -3173,7 +3219,8 @@ static gboolean _set_fcn_infiniband_p_key(ARGS_SET_FCN)
return TRUE; return TRUE;
} }
static gconstpointer _get_fcn_infiniband_p_key(ARGS_GET_FCN) static gconstpointer
_get_fcn_infiniband_p_key(ARGS_GET_FCN)
{ {
NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND(setting); NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND(setting);
int p_key; int p_key;
@@ -3192,7 +3239,8 @@ static gconstpointer _get_fcn_infiniband_p_key(ARGS_GET_FCN)
RETURN_STR_TO_FREE(g_strdup_printf("0x%04x", p_key)); RETURN_STR_TO_FREE(g_strdup_printf("0x%04x", p_key));
} }
static gconstpointer _get_fcn_objlist(ARGS_GET_FCN) static gconstpointer
_get_fcn_objlist(ARGS_GET_FCN)
{ {
GString *str = NULL; GString *str = NULL;
guint num; guint num;
@@ -3314,7 +3362,8 @@ _objlist_obj_to_str_fcn_ip_config_routes(NMMetaAccessorGetType get_type,
} }
} }
static gboolean _set_fcn_ip_config_method(ARGS_SET_FCN) static gboolean
_set_fcn_ip_config_method(ARGS_SET_FCN)
{ {
if (_SET_FCN_DO_RESET_DEFAULT(property_info, modifier, value)) if (_SET_FCN_DO_RESET_DEFAULT(property_info, modifier, value))
return _gobject_property_reset_default(setting, property_info->property_name); return _gobject_property_reset_default(setting, property_info->property_name);
@@ -3367,7 +3416,8 @@ _multilist_add_fcn_ip_config_dns_options(NMSetting *setting, const char *item)
return TRUE; return TRUE;
} }
static gboolean _set_fcn_objlist(ARGS_SET_FCN) static gboolean
_set_fcn_objlist(ARGS_SET_FCN)
{ {
gs_free const char **strv = NULL; gs_free const char **strv = NULL;
gsize i, nstrv; gsize i, nstrv;
@@ -3457,7 +3507,8 @@ _objlist_set_fcn_ip_config_addresses(NMSetting * setting,
return TRUE; return TRUE;
} }
static gboolean _set_fcn_ip_config_gateway(ARGS_SET_FCN) static gboolean
_set_fcn_ip_config_gateway(ARGS_SET_FCN)
{ {
gs_free char *value_to_free = NULL; gs_free char *value_to_free = NULL;
int addr_family = nm_setting_ip_config_get_addr_family(NM_SETTING_IP_CONFIG(setting)); int addr_family = nm_setting_ip_config_get_addr_family(NM_SETTING_IP_CONFIG(setting));
@@ -3594,7 +3645,8 @@ _multilist_remove_by_value_fcn_ip_config_dhcp_reject_servers(NMSettingIPConfig *
return TRUE; return TRUE;
} }
static gconstpointer _get_fcn_olpc_mesh_ssid(ARGS_GET_FCN) static gconstpointer
_get_fcn_olpc_mesh_ssid(ARGS_GET_FCN)
{ {
NMSettingOlpcMesh *s_olpc_mesh = NM_SETTING_OLPC_MESH(setting); NMSettingOlpcMesh *s_olpc_mesh = NM_SETTING_OLPC_MESH(setting);
GBytes *ssid; GBytes *ssid;
@@ -3611,7 +3663,8 @@ static gconstpointer _get_fcn_olpc_mesh_ssid(ARGS_GET_FCN)
RETURN_STR_TO_FREE(ssid_str); RETURN_STR_TO_FREE(ssid_str);
} }
static gboolean _set_fcn_olpc_mesh_channel(ARGS_SET_FCN) static gboolean
_set_fcn_olpc_mesh_channel(ARGS_SET_FCN)
{ {
unsigned long chan_int; unsigned long chan_int;
@@ -3871,7 +3924,8 @@ _objlist_set_fcn_team_link_watchers(NMSetting * setting,
return TRUE; return TRUE;
} }
static gconstpointer _get_fcn_vlan_flags(ARGS_GET_FCN) static gconstpointer
_get_fcn_vlan_flags(ARGS_GET_FCN)
{ {
NMSettingVlan *s_vlan = NM_SETTING_VLAN(setting); NMSettingVlan *s_vlan = NM_SETTING_VLAN(setting);
guint32 flags; guint32 flags;
@@ -3898,7 +3952,8 @@ _vlan_priority_map_type_from_property_info(const NMMetaPropertyInfo *property_in
: NM_VLAN_EGRESS_MAP; : NM_VLAN_EGRESS_MAP;
} }
static gconstpointer _get_fcn_vlan_xgress_priority_map(ARGS_GET_FCN) static gconstpointer
_get_fcn_vlan_xgress_priority_map(ARGS_GET_FCN)
{ {
NMVlanPriorityMap map_type = _vlan_priority_map_type_from_property_info(property_info); NMVlanPriorityMap map_type = _vlan_priority_map_type_from_property_info(property_info);
NMSettingVlan *s_vlan = NM_SETTING_VLAN(setting); NMSettingVlan *s_vlan = NM_SETTING_VLAN(setting);
@@ -3927,7 +3982,8 @@ static gconstpointer _get_fcn_vlan_xgress_priority_map(ARGS_GET_FCN)
RETURN_STR_TO_FREE(g_string_free(str, FALSE)); RETURN_STR_TO_FREE(g_string_free(str, FALSE));
} }
static gboolean _set_fcn_vlan_xgress_priority_map(ARGS_SET_FCN) static gboolean
_set_fcn_vlan_xgress_priority_map(ARGS_SET_FCN)
{ {
NMVlanPriorityMap map_type = _vlan_priority_map_type_from_property_info(property_info); NMVlanPriorityMap map_type = _vlan_priority_map_type_from_property_info(property_info);
gs_free const char **prio_map = NULL; gs_free const char **prio_map = NULL;
@@ -3982,7 +4038,8 @@ _vpn_options_callback(const char *key, const char *val, gpointer user_data)
g_string_append(str, nm_utils_escaped_tokens_options_escape_val(val, &escaped_val)); g_string_append(str, nm_utils_escaped_tokens_options_escape_val(val, &escaped_val));
} }
static gconstpointer _get_fcn_vpn_options(ARGS_GET_FCN) static gconstpointer
_get_fcn_vpn_options(ARGS_GET_FCN)
{ {
NMSettingVpn *s_vpn = NM_SETTING_VPN(setting); NMSettingVpn *s_vpn = NM_SETTING_VPN(setting);
GString *str; GString *str;
@@ -4024,7 +4081,8 @@ _optionlist_set_fcn_vpn_secrets(NMSetting * setting,
return TRUE; return TRUE;
} }
static gboolean _set_fcn_wired_s390_subchannels(ARGS_SET_FCN) static gboolean
_set_fcn_wired_s390_subchannels(ARGS_SET_FCN)
{ {
gs_free const char **strv = NULL; gs_free const char **strv = NULL;
gsize len; gsize len;
@@ -4056,12 +4114,14 @@ _optionlist_set_fcn_wired_s390_options(NMSetting * setting,
return TRUE; return TRUE;
} }
static const char *const *_values_fcn_wired_s390_options(ARGS_VALUES_FCN) static const char *const *
_values_fcn_wired_s390_options(ARGS_VALUES_FCN)
{ {
return nm_setting_wired_get_valid_s390_options(NULL); return nm_setting_wired_get_valid_s390_options(NULL);
} }
static const char *_describe_fcn_wired_s390_options(ARGS_DESCRIBE_FCN) static const char *
_describe_fcn_wired_s390_options(ARGS_DESCRIBE_FCN)
{ {
gs_free char *options_str = NULL; gs_free char *options_str = NULL;
const char **valid_options; const char **valid_options;
@@ -4078,7 +4138,8 @@ static const char *_describe_fcn_wired_s390_options(ARGS_DESCRIBE_FCN)
return (*out_to_free = s); return (*out_to_free = s);
} }
static gconstpointer _get_fcn_wireless_ssid(ARGS_GET_FCN) static gconstpointer
_get_fcn_wireless_ssid(ARGS_GET_FCN)
{ {
NMSettingWireless *s_wireless = NM_SETTING_WIRELESS(setting); NMSettingWireless *s_wireless = NM_SETTING_WIRELESS(setting);
GBytes *ssid; GBytes *ssid;
@@ -4095,7 +4156,8 @@ static gconstpointer _get_fcn_wireless_ssid(ARGS_GET_FCN)
RETURN_STR_TO_FREE(ssid_str); RETURN_STR_TO_FREE(ssid_str);
} }
static gboolean _set_fcn_wireless_channel(ARGS_SET_FCN) static gboolean
_set_fcn_wireless_channel(ARGS_SET_FCN)
{ {
unsigned long chan_int; unsigned long chan_int;
@@ -4133,7 +4195,8 @@ _multilist_validate2_fcn_mac_addr(NMSetting *setting, const char *item, GError *
return item; return item;
} }
static gconstpointer _get_fcn_wireless_security_wep_key(ARGS_GET_FCN) static gconstpointer
_get_fcn_wireless_security_wep_key(ARGS_GET_FCN)
{ {
NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY(setting); NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY(setting);
char *key; char *key;
@@ -4152,7 +4215,8 @@ static gconstpointer _get_fcn_wireless_security_wep_key(ARGS_GET_FCN)
RETURN_STR_TO_FREE(key); RETURN_STR_TO_FREE(key);
} }
static gboolean _set_fcn_wireless_wep_key(ARGS_SET_FCN) static gboolean
_set_fcn_wireless_wep_key(ARGS_SET_FCN)
{ {
NMWepKeyType guessed_type = NM_WEP_KEY_TYPE_UNKNOWN; NMWepKeyType guessed_type = NM_WEP_KEY_TYPE_UNKNOWN;
NMWepKeyType type; NMWepKeyType type;
@@ -4255,7 +4319,8 @@ _gobject_enum_pre_set_notify_fcn_wireless_security_wep_key_type(
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _get_fcn_ethtool(ARGS_GET_FCN) static gconstpointer
_get_fcn_ethtool(ARGS_GET_FCN)
{ {
NMEthtoolID ethtool_id = property_info->property_typ_data->subtype.ethtool.ethtool_id; NMEthtoolID ethtool_id = property_info->property_typ_data->subtype.ethtool.ethtool_id;
const char *s; const char *s;
@@ -4286,7 +4351,8 @@ static gconstpointer _get_fcn_ethtool(ARGS_GET_FCN)
return s; return s;
} }
static gboolean _set_fcn_ethtool(ARGS_SET_FCN) static gboolean
_set_fcn_ethtool(ARGS_SET_FCN)
{ {
NMEthtoolID ethtool_id = property_info->property_typ_data->subtype.ethtool.ethtool_id; NMEthtoolID ethtool_id = property_info->property_typ_data->subtype.ethtool.ethtool_id;
gint64 i64; gint64 i64;
@@ -4336,7 +4402,8 @@ do_unset:
return TRUE; return TRUE;
} }
static const char *const *_complete_fcn_ethtool(ARGS_COMPLETE_FCN) static const char *const *
_complete_fcn_ethtool(ARGS_COMPLETE_FCN)
{ {
static const char *const v[] = { static const char *const v[] = {
"true", "true",

3
src/nmcli/agent.c
View File

@@ -56,7 +56,8 @@ usage_agent_all(void)
static char *pre_input_deftext; static char *pre_input_deftext;
static int set_deftext(_NMC_RL_STARTUPHOOK_ARGS) static int
set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
{ {
if (pre_input_deftext && rl_startup_hook) { if (pre_input_deftext && rl_startup_hook) {
rl_insert_text(pre_input_deftext); rl_insert_text(pre_input_deftext);

12
src/nmcli/common.c
View File

@@ -92,7 +92,8 @@ _ip_config_get_routes(NMIPConfig *cfg)
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _metagen_ip4_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_ip4_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMIPConfig *cfg4 = target; NMIPConfig *cfg4 = target;
GPtrArray *ptr_array; GPtrArray *ptr_array;
@@ -185,7 +186,8 @@ const NmcMetaGenericInfo *const metagen_ip4_config[_NMC_GENERIC_INFO_TYPE_IP4_CO
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _metagen_ip6_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_ip6_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMIPConfig *cfg6 = target; NMIPConfig *cfg6 = target;
GPtrArray *ptr_array; GPtrArray *ptr_array;
@@ -272,7 +274,8 @@ const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CO
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _metagen_dhcp_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_dhcp_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMDhcpConfig *dhcp = target; NMDhcpConfig *dhcp = target;
guint i; guint i;
@@ -1152,7 +1155,8 @@ nmc_rl_gen_func_ifnames(const char *text, int state)
char *nmc_rl_pre_input_deftext; char *nmc_rl_pre_input_deftext;
int nmc_rl_set_deftext(_NMC_RL_STARTUPHOOK_ARGS) int
nmc_rl_set_deftext(_NMC_RL_STARTUPHOOK_ARGS)
{ {
if (nmc_rl_pre_input_deftext && rl_startup_hook) { if (nmc_rl_pre_input_deftext && rl_startup_hook) {
rl_insert_text(nmc_rl_pre_input_deftext); rl_insert_text(nmc_rl_pre_input_deftext);

9
src/nmcli/connections.c
View File

@@ -513,7 +513,8 @@ _con_show_fcn_get_type(NMConnection *c, NMActiveConnection *ac, NMMetaAccessorGe
return connection_type_to_display(s, get_type); return connection_type_to_display(s, get_type);
} }
static gconstpointer _metagen_con_show_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_con_show_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
const MetagenConShowRowData *row_data = target; const MetagenConShowRowData *row_data = target;
NMConnection *c = row_data->connection; NMConnection *c = row_data->connection;
@@ -654,7 +655,8 @@ const NmcMetaGenericInfo *const metagen_con_show[_NMC_GENERIC_INFO_TYPE_CON_SHOW
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _metagen_con_active_general_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_con_active_general_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMActiveConnection *ac = target; NMActiveConnection *ac = target;
NMConnection *c; NMConnection *c;
@@ -767,7 +769,8 @@ const NmcMetaGenericInfo
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _metagen_con_active_vpn_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_con_active_vpn_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMActiveConnection *ac = target; NMActiveConnection *ac = target;
NMConnection *c; NMConnection *c;

12
src/nmcli/devices.c
View File

@@ -93,7 +93,8 @@ wifi_signal_to_color(guint8 strength)
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _metagen_device_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_device_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMDevice *d = target; NMDevice *d = target;
NMActiveConnection *ac; NMActiveConnection *ac;
@@ -152,7 +153,8 @@ const NmcMetaGenericInfo
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _metagen_device_detail_general_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_device_detail_general_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMDevice *d = target; NMDevice *d = target;
NMActiveConnection *ac; NMActiveConnection *ac;
@@ -333,7 +335,8 @@ _device_get_available_connections(NMDevice *d, guint *out_len)
return avail_cons; return avail_cons;
} }
static gconstpointer _metagen_device_detail_connections_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_device_detail_connections_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMDevice *d = target; NMDevice *d = target;
gs_free NMRemoteConnection **avail_cons = NULL; gs_free NMRemoteConnection **avail_cons = NULL;
@@ -447,7 +450,8 @@ const NmcMetaGenericInfo *const
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _metagen_device_detail_capabilities_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_device_detail_capabilities_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMDevice *d = target; NMDevice *d = target;
NMDeviceCapabilities caps; NMDeviceCapabilities caps;

9
src/nmcli/general.c
View File

@@ -108,7 +108,8 @@ static NM_UTILS_LOOKUP_DEFINE(
static const NmcMetaGenericInfo *const metagen_general_status[]; static const NmcMetaGenericInfo *const metagen_general_status[];
static gconstpointer _metagen_general_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_general_status_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NmCli *nmc = target; NmCli *nmc = target;
const char *value; const char *value;
@@ -209,7 +210,8 @@ static const NmcMetaGenericInfo
/*****************************************************************************/ /*****************************************************************************/
static gconstpointer _metagen_general_permissions_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_general_permissions_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NMClientPermission perm = GPOINTER_TO_UINT(target); NMClientPermission perm = GPOINTER_TO_UINT(target);
NmCli *nmc = environment_user_data; NmCli *nmc = environment_user_data;
@@ -252,7 +254,8 @@ typedef struct {
char **domains; char **domains;
} GetGeneralLoggingData; } GetGeneralLoggingData;
static gconstpointer _metagen_general_logging_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS) static gconstpointer
_metagen_general_logging_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{ {
NmCli *nmc = environment_user_data; NmCli *nmc = environment_user_data;
GetGeneralLoggingData *d = target; GetGeneralLoggingData *d = target;