fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-04 21:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: use _nm_setting_property_define_gprop_strv_oldstyle()

Browse source 
Use _nm_setting_property_define_gprop_strv_oldstyle() for all existing
(remaining) G_TYPE_STRV properties.

The benefit is that the properties_override array already lists the
property, and we don't need special hacks in _nm_setting_class_commit()
to initialize those properties.

Also, this style is discouraged. We can now easier find all properties
that should be reworked.
This commit is contained in:
Thomas Haller 2023-10-25 13:17:37 +02:00
parent 907970d08b
commit 7113c0c67e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
7 changed files with 72 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/libnm-core-impl/nm-setting-8021x.c
View file

@ -3223,11 +3223,11 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass)
* example: IEEE_8021X_EAP_METHODS=PEAP
* ---end---
*/
obj_properties[PROP_EAP] = g_param_spec_boxed(NM_SETTING_802_1X_EAP,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_802_1X_EAP,
PROP_EAP,
NM_SETTING_PARAM_NONE);
/**
* NMSetting8021x:identity:
@ -3422,12 +3422,11 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass)
* example: IEEE_8021X_ALTSUBJECT_MATCHES="s1.domain.cc"
* ---end---
*/
obj_properties[PROP_ALTSUBJECT_MATCHES] =
g_param_spec_boxed(NM_SETTING_802_1X_ALTSUBJECT_MATCHES,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_802_1X_ALTSUBJECT_MATCHES,
PROP_ALTSUBJECT_MATCHES,
NM_SETTING_PARAM_NONE);
/**
* NMSetting8021x:domain-suffix-match:
@ -3835,12 +3834,11 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass)
* variable: IEEE_8021X_PHASE2_ALTSUBJECT_MATCHES(+)
* ---end---
*/
obj_properties[PROP_PHASE2_ALTSUBJECT_MATCHES] =
g_param_spec_boxed(NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES,
PROP_PHASE2_ALTSUBJECT_MATCHES,
NM_SETTING_PARAM_NONE);
/**
* NMSetting8021x:phase2-domain-suffix-match:

11
src/libnm-core-impl/nm-setting-connection.c
View file

@ -2034,12 +2034,11 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
* example: USERS="joe bob"
* ---end---
*/
obj_properties[PROP_PERMISSIONS] =
g_param_spec_boxed(NM_SETTING_CONNECTION_PERMISSIONS,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_CONNECTION_PERMISSIONS,
PROP_PERMISSIONS,
NM_SETTING_PARAM_NONE);
/**
* NMSettingConnection:autoconnect:

12
src/libnm-core-impl/nm-setting-ip-config.c
View file

@ -6130,6 +6130,18 @@ _nm_sett_info_property_override_create_array_ip_config(int addr_family)
.direct_offset =
NM_STRUCT_OFFSET_ENSURE_TYPE(int, NMSettingIPConfigPrivate, replace_local_rule));
_nm_properties_override_gobj(properties_override,
obj_properties[PROP_DNS_SEARCH],
&nm_sett_info_propert_type_gprop_strv_oldstyle);
_nm_properties_override_gobj(properties_override,
obj_properties[PROP_DNS_OPTIONS],
&nm_sett_info_propert_type_gprop_strv_oldstyle);
_nm_properties_override_gobj(properties_override,
obj_properties[PROP_DHCP_REJECT_SERVERS],
&nm_sett_info_propert_type_gprop_strv_oldstyle);
return properties_override;
}

22
src/libnm-core-impl/nm-setting-vlan.c
View file

@ -979,12 +979,11 @@ nm_setting_vlan_class_init(NMSettingVlanClass *klass)
* example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5
* ---end---
*/
obj_properties[PROP_INGRESS_PRIORITY_MAP] = g_param_spec_boxed(
NM_SETTING_VLAN_INGRESS_PRIORITY_MAP,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_VLAN_INGRESS_PRIORITY_MAP,
PROP_INGRESS_PRIORITY_MAP,
NM_SETTING_PARAM_INFERRABLE);
/**
* NMSettingVlan:egress-priority-map:
@ -1000,12 +999,11 @@ nm_setting_vlan_class_init(NMSettingVlanClass *klass)
* example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7
* ---end---
*/
obj_properties[PROP_EGRESS_PRIORITY_MAP] = g_param_spec_boxed(
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP,
PROP_EGRESS_PRIORITY_MAP,
NM_SETTING_PARAM_INFERRABLE);
/* ---ifcfg-rh---
* property: interface-name

22
src/libnm-core-impl/nm-setting-wired.c
View file

@ -1483,12 +1483,11 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
* example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55"
* ---end---
*/
obj_properties[PROP_MAC_ADDRESS_BLACKLIST] = g_param_spec_boxed(
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST,
PROP_MAC_ADDRESS_BLACKLIST,
NM_SETTING_PARAM_FUZZY_IGNORE);
/**
* NMSettingWired:mtu:
@ -1531,12 +1530,11 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
* example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00c
* ---end---
*/
obj_properties[PROP_S390_SUBCHANNELS] = g_param_spec_boxed(
NM_SETTING_WIRED_S390_SUBCHANNELS,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_WIRED_S390_SUBCHANNELS,
PROP_S390_SUBCHANNELS,
NM_SETTING_PARAM_INFERRABLE);
/**
* NMSettingWired:s390-nettype:

30
src/libnm-core-impl/nm-setting-wireless-security.c
View file

@ -1490,11 +1490,11 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass)
* description: Allowed WPA protocols, WPA and WPA2 (RSN).
* ---end---
*/
obj_properties[PROP_PROTO] = g_param_spec_boxed(NM_SETTING_WIRELESS_SECURITY_PROTO,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_WIRELESS_SECURITY_PROTO,
PROP_PROTO,
NM_SETTING_PARAM_NONE);
/**
* NMSettingWirelessSecurity:pairwise:
@ -1512,11 +1512,11 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass)
* separated list.
* ---end---
*/
obj_properties[PROP_PAIRWISE] = g_param_spec_boxed(NM_SETTING_WIRELESS_SECURITY_PAIRWISE,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_WIRELESS_SECURITY_PAIRWISE,
PROP_PAIRWISE,
NM_SETTING_PARAM_NONE);
/**
* NMSettingWirelessSecurity:group:
@ -1534,11 +1534,11 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass)
* separated list.
* ---end---
*/
obj_properties[PROP_GROUP] = g_param_spec_boxed(NM_SETTING_WIRELESS_SECURITY_GROUP,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_WIRELESS_SECURITY_GROUP,
PROP_GROUP,
NM_SETTING_PARAM_NONE);
/**
* NMSettingWirelessSecurity:pmf:

11
src/libnm-core-impl/nm-setting-wireless.c
View file

@ -1680,12 +1680,11 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
* is listed.
* ---end---
*/
obj_properties[PROP_MAC_ADDRESS_BLACKLIST] = g_param_spec_boxed(
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST,
"",
"",
G_TYPE_STRV,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
_nm_setting_property_define_gprop_strv_oldstyle(properties_override,
obj_properties,
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST,
PROP_MAC_ADDRESS_BLACKLIST,
NM_SETTING_PARAM_FUZZY_IGNORE);
/**
* NMSettingWireless:seen-bssids: