clients/trivial: move code in nm-meta-setting-desc around

Sort by name.
This commit is contained in:
Thomas Haller 2019-01-28 16:58:58 +01:00
parent 09090f2669
commit 0ec30f8904

View file

@ -5171,6 +5171,19 @@ static const NMMetaPropertyType _pt_ethtool = {
), \
),
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
.is_cli_option = TRUE,
.property_alias = "dev",
.inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
.prompt = N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"),
.property_type = &_pt_gobject_string,
),
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_802_1X
static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_EAP,
@ -6619,41 +6632,6 @@ static const NMMetaPropertyInfo *const property_infos_OLPC_MESH[] = {
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPPOE
static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PARENT,
.is_cli_option = TRUE,
.property_alias = "parent",
.prompt = N_("PPPoE parent device"),
.property_type = &_pt_gobject_string,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_SERVICE,
.is_cli_option = TRUE,
.property_alias = "service",
.prompt = N_("Service [none]"),
.property_type = &_pt_gobject_string,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_USERNAME,
.is_cli_option = TRUE,
.property_alias = "username",
.inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
.prompt = N_("PPPoE username"),
.property_type = &_pt_gobject_string,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD,
.is_cli_option = TRUE,
.property_alias = "password",
.prompt = N_("Password [none]"),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD_FLAGS,
.property_type = &_pt_gobject_secret_flags,
),
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_BRIDGE
static const NMMetaPropertyInfo *const property_infos_OVS_BRIDGE[] = {
@ -6792,6 +6770,41 @@ static const NMMetaPropertyInfo *const property_infos_PPP[] = {
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPPOE
static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PARENT,
.is_cli_option = TRUE,
.property_alias = "parent",
.prompt = N_("PPPoE parent device"),
.property_type = &_pt_gobject_string,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_SERVICE,
.is_cli_option = TRUE,
.property_alias = "service",
.prompt = N_("Service [none]"),
.property_type = &_pt_gobject_string,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_USERNAME,
.is_cli_option = TRUE,
.property_alias = "username",
.inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
.prompt = N_("PPPoE username"),
.property_type = &_pt_gobject_string,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD,
.is_cli_option = TRUE,
.property_alias = "password",
.prompt = N_("Password [none]"),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD_FLAGS,
.property_type = &_pt_gobject_secret_flags,
),
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PROXY
static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
@ -6833,6 +6846,78 @@ static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SERIAL
static const NMMetaPropertyInfo *const property_infos_SERIAL[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BAUD,
.property_type = &_pt_gobject_int,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BITS,
.property_type = &_pt_gobject_int,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_PARITY,
.property_type = &_pt_gobject_enum,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
.value_infos = ENUM_VALUE_INFOS (
{
.value = NM_SETTING_SERIAL_PARITY_EVEN,
.nick = "E",
},
{
.value = NM_SETTING_SERIAL_PARITY_EVEN,
.nick = "e",
},
{
.value = NM_SETTING_SERIAL_PARITY_ODD,
.nick = "O",
},
{
.value = NM_SETTING_SERIAL_PARITY_ODD,
.nick = "o",
},
{
.value = NM_SETTING_SERIAL_PARITY_NONE,
.nick = "N",
},
{
.value = NM_SETTING_SERIAL_PARITY_NONE,
.nick = "n",
}
),
),
.typ_flags = NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
| NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
),
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_STOPBITS,
.property_type = &_pt_gobject_int,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_SEND_DELAY,
.property_type = &_pt_gobject_int,
),
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SRIOV
static const NMMetaPropertyInfo *const property_infos_SRIOV[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_TOTAL_VFS,
.property_type = &_pt_gobject_int,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_VFS,
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_sriov_vfs,
.set_fcn = _set_fcn_sriov_vfs,
.remove_fcn = _remove_fcn_sriov_vfs,
),
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS,
.property_type = &_pt_gobject_enum,
),
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TC_CONFIG
static const NMMetaPropertyInfo *const property_infos_TC_CONFIG[] = {
@ -7073,78 +7158,6 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SERIAL
static const NMMetaPropertyInfo *const property_infos_SERIAL[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BAUD,
.property_type = &_pt_gobject_int,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BITS,
.property_type = &_pt_gobject_int,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_PARITY,
.property_type = &_pt_gobject_enum,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
.value_infos = ENUM_VALUE_INFOS (
{
.value = NM_SETTING_SERIAL_PARITY_EVEN,
.nick = "E",
},
{
.value = NM_SETTING_SERIAL_PARITY_EVEN,
.nick = "e",
},
{
.value = NM_SETTING_SERIAL_PARITY_ODD,
.nick = "O",
},
{
.value = NM_SETTING_SERIAL_PARITY_ODD,
.nick = "o",
},
{
.value = NM_SETTING_SERIAL_PARITY_NONE,
.nick = "N",
},
{
.value = NM_SETTING_SERIAL_PARITY_NONE,
.nick = "n",
}
),
),
.typ_flags = NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
| NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
),
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_STOPBITS,
.property_type = &_pt_gobject_int,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_SEND_DELAY,
.property_type = &_pt_gobject_int,
),
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SRIOV
static const NMMetaPropertyInfo *const property_infos_SRIOV[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_TOTAL_VFS,
.property_type = &_pt_gobject_int,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_VFS,
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_sriov_vfs,
.set_fcn = _set_fcn_sriov_vfs,
.remove_fcn = _remove_fcn_sriov_vfs,
),
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS,
.property_type = &_pt_gobject_enum,
),
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TUN
static const NMMetaPropertyInfo *const property_infos_TUN[] = {
@ -7851,19 +7864,6 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = {
NULL
};
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
.is_cli_option = TRUE,
.property_alias = "dev",
.inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
.prompt = N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"),
.property_type = &_pt_gobject_string,
),
NULL
};
/*****************************************************************************/
static void