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

libnm/trivial: rename internal connection-get-setting methods

Browse source 
This function will be exposed on the internal header. Rename to
_nm_connection_get_setting_by_metatype().

(cherry picked from commit 27cbf584bd)
This commit is contained in:
Thomas Haller 2023-05-03 11:43:33 +02:00
parent c965896038
commit 0837d43fdd
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 40 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -313,7 +313,7 @@ _connection_get_setting_check(NMConnection *connection, GType setting_type)
} }
static gpointer static gpointer
_connection_get_setting_by_meta_type_check(NMConnection *connection, NMMetaSettingType meta_type) _nm_connection_get_setting_by_metatype(NMConnection *connection, NMMetaSettingType meta_type)
{ {
g_return_val_if_fail(NM_IS_CONNECTION(connection), NULL); g_return_val_if_fail(NM_IS_CONNECTION(connection), NULL);
@ -3247,7 +3247,7 @@ nm_connection_get_virtual_device_description(NMConnection *connection)
NMSetting8021x * NMSetting8021x *
nm_connection_get_setting_802_1x(NMConnection *connection) nm_connection_get_setting_802_1x(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_802_1X); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_802_1X);
} }
/** /**
@ -3261,7 +3261,7 @@ nm_connection_get_setting_802_1x(NMConnection *connection)
NMSettingBluetooth * NMSettingBluetooth *
nm_connection_get_setting_bluetooth(NMConnection *connection) nm_connection_get_setting_bluetooth(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_BLUETOOTH); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_BLUETOOTH);
} }
/** /**
@ -3275,7 +3275,7 @@ nm_connection_get_setting_bluetooth(NMConnection *connection)
NMSettingBond * NMSettingBond *
nm_connection_get_setting_bond(NMConnection *connection) nm_connection_get_setting_bond(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_BOND); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_BOND);
} }
/** /**
@ -3289,7 +3289,7 @@ nm_connection_get_setting_bond(NMConnection *connection)
NMSettingTeam * NMSettingTeam *
nm_connection_get_setting_team(NMConnection *connection) nm_connection_get_setting_team(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_TEAM); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_TEAM);
} }
/** /**
@ -3303,7 +3303,7 @@ nm_connection_get_setting_team(NMConnection *connection)
NMSettingTeamPort * NMSettingTeamPort *
nm_connection_get_setting_team_port(NMConnection *connection) nm_connection_get_setting_team_port(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_TEAM_PORT); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_TEAM_PORT);
} }
/** /**
@ -3317,7 +3317,7 @@ nm_connection_get_setting_team_port(NMConnection *connection)
NMSettingBridge * NMSettingBridge *
nm_connection_get_setting_bridge(NMConnection *connection) nm_connection_get_setting_bridge(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_BRIDGE); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_BRIDGE);
} }
/** /**
@ -3331,7 +3331,7 @@ nm_connection_get_setting_bridge(NMConnection *connection)
NMSettingCdma * NMSettingCdma *
nm_connection_get_setting_cdma(NMConnection *connection) nm_connection_get_setting_cdma(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_CDMA); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_CDMA);
} }
/** /**
@ -3345,7 +3345,7 @@ nm_connection_get_setting_cdma(NMConnection *connection)
NMSettingConnection * NMSettingConnection *
nm_connection_get_setting_connection(NMConnection *connection) nm_connection_get_setting_connection(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_CONNECTION); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_CONNECTION);
} }
/** /**
@ -3359,7 +3359,7 @@ nm_connection_get_setting_connection(NMConnection *connection)
NMSettingDcb * NMSettingDcb *
nm_connection_get_setting_dcb(NMConnection *connection) nm_connection_get_setting_dcb(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_DCB); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_DCB);
} }
/** /**
@ -3375,7 +3375,7 @@ nm_connection_get_setting_dcb(NMConnection *connection)
NMSettingDummy * NMSettingDummy *
nm_connection_get_setting_dummy(NMConnection *connection) nm_connection_get_setting_dummy(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_DUMMY); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_DUMMY);
} }
/** /**
@ -3389,7 +3389,7 @@ nm_connection_get_setting_dummy(NMConnection *connection)
NMSettingGeneric * NMSettingGeneric *
nm_connection_get_setting_generic(NMConnection *connection) nm_connection_get_setting_generic(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_GENERIC); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_GENERIC);
} }
/** /**
@ -3403,7 +3403,7 @@ nm_connection_get_setting_generic(NMConnection *connection)
NMSettingGsm * NMSettingGsm *
nm_connection_get_setting_gsm(NMConnection *connection) nm_connection_get_setting_gsm(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_GSM); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_GSM);
} }
/** /**
@ -3417,7 +3417,7 @@ nm_connection_get_setting_gsm(NMConnection *connection)
NMSettingInfiniband * NMSettingInfiniband *
nm_connection_get_setting_infiniband(NMConnection *connection) nm_connection_get_setting_infiniband(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_INFINIBAND); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_INFINIBAND);
} }
/** /**
@ -3436,7 +3436,7 @@ nm_connection_get_setting_infiniband(NMConnection *connection)
NMSettingIPConfig * NMSettingIPConfig *
nm_connection_get_setting_ip4_config(NMConnection *connection) nm_connection_get_setting_ip4_config(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_IP4_CONFIG); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_IP4_CONFIG);
} }
/** /**
@ -3452,7 +3452,7 @@ nm_connection_get_setting_ip4_config(NMConnection *connection)
NMSettingIPTunnel * NMSettingIPTunnel *
nm_connection_get_setting_ip_tunnel(NMConnection *connection) nm_connection_get_setting_ip_tunnel(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_IP_TUNNEL); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_IP_TUNNEL);
} }
/** /**
@ -3471,7 +3471,7 @@ nm_connection_get_setting_ip_tunnel(NMConnection *connection)
NMSettingIPConfig * NMSettingIPConfig *
nm_connection_get_setting_ip6_config(NMConnection *connection) nm_connection_get_setting_ip6_config(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_IP6_CONFIG); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_IP6_CONFIG);
} }
/** /**
@ -3487,7 +3487,7 @@ nm_connection_get_setting_ip6_config(NMConnection *connection)
NMSettingMacsec * NMSettingMacsec *
nm_connection_get_setting_macsec(NMConnection *connection) nm_connection_get_setting_macsec(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_MACSEC); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_MACSEC);
} }
/** /**
@ -3503,7 +3503,7 @@ nm_connection_get_setting_macsec(NMConnection *connection)
NMSettingMacvlan * NMSettingMacvlan *
nm_connection_get_setting_macvlan(NMConnection *connection) nm_connection_get_setting_macvlan(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_MACVLAN); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_MACVLAN);
} }
/** /**
@ -3517,7 +3517,7 @@ nm_connection_get_setting_macvlan(NMConnection *connection)
NMSettingOlpcMesh * NMSettingOlpcMesh *
nm_connection_get_setting_olpc_mesh(NMConnection *connection) nm_connection_get_setting_olpc_mesh(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_OLPC_MESH); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_OLPC_MESH);
} }
/** /**
@ -3533,7 +3533,7 @@ nm_connection_get_setting_olpc_mesh(NMConnection *connection)
NMSettingOvsBridge * NMSettingOvsBridge *
nm_connection_get_setting_ovs_bridge(NMConnection *connection) nm_connection_get_setting_ovs_bridge(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_OVS_BRIDGE); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_OVS_BRIDGE);
} }
/** /**
@ -3549,8 +3549,7 @@ nm_connection_get_setting_ovs_bridge(NMConnection *connection)
NMSettingOvsInterface * NMSettingOvsInterface *
nm_connection_get_setting_ovs_interface(NMConnection *connection) nm_connection_get_setting_ovs_interface(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_OVS_INTERFACE);
NM_META_SETTING_TYPE_OVS_INTERFACE);
} }
/** /**
@ -3566,7 +3565,7 @@ nm_connection_get_setting_ovs_interface(NMConnection *connection)
NMSettingOvsPatch * NMSettingOvsPatch *
nm_connection_get_setting_ovs_patch(NMConnection *connection) nm_connection_get_setting_ovs_patch(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_OVS_PATCH); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_OVS_PATCH);
} }
/** /**
@ -3582,7 +3581,7 @@ nm_connection_get_setting_ovs_patch(NMConnection *connection)
NMSettingOvsPort * NMSettingOvsPort *
nm_connection_get_setting_ovs_port(NMConnection *connection) nm_connection_get_setting_ovs_port(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_OVS_PORT); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_OVS_PORT);
} }
/** /**
@ -3596,7 +3595,7 @@ nm_connection_get_setting_ovs_port(NMConnection *connection)
NMSettingPpp * NMSettingPpp *
nm_connection_get_setting_ppp(NMConnection *connection) nm_connection_get_setting_ppp(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_PPP); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_PPP);
} }
/** /**
@ -3610,7 +3609,7 @@ nm_connection_get_setting_ppp(NMConnection *connection)
NMSettingPppoe * NMSettingPppoe *
nm_connection_get_setting_pppoe(NMConnection *connection) nm_connection_get_setting_pppoe(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_PPPOE); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_PPPOE);
} }
/** /**
@ -3626,7 +3625,7 @@ nm_connection_get_setting_pppoe(NMConnection *connection)
NMSettingProxy * NMSettingProxy *
nm_connection_get_setting_proxy(NMConnection *connection) nm_connection_get_setting_proxy(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_PROXY); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_PROXY);
} }
/** /**
@ -3640,7 +3639,7 @@ nm_connection_get_setting_proxy(NMConnection *connection)
NMSettingSerial * NMSettingSerial *
nm_connection_get_setting_serial(NMConnection *connection) nm_connection_get_setting_serial(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_SERIAL); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_SERIAL);
} }
/** /**
@ -3656,7 +3655,7 @@ nm_connection_get_setting_serial(NMConnection *connection)
NMSettingTCConfig * NMSettingTCConfig *
nm_connection_get_setting_tc_config(NMConnection *connection) nm_connection_get_setting_tc_config(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_TC_CONFIG); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_TC_CONFIG);
} }
/** /**
@ -3672,7 +3671,7 @@ nm_connection_get_setting_tc_config(NMConnection *connection)
NMSettingTun * NMSettingTun *
nm_connection_get_setting_tun(NMConnection *connection) nm_connection_get_setting_tun(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_TUN); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_TUN);
} }
/** /**
@ -3686,7 +3685,7 @@ nm_connection_get_setting_tun(NMConnection *connection)
NMSettingVpn * NMSettingVpn *
nm_connection_get_setting_vpn(NMConnection *connection) nm_connection_get_setting_vpn(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_VPN); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_VPN);
} }
/** /**
@ -3702,7 +3701,7 @@ nm_connection_get_setting_vpn(NMConnection *connection)
NMSettingVxlan * NMSettingVxlan *
nm_connection_get_setting_vxlan(NMConnection *connection) nm_connection_get_setting_vxlan(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_VXLAN); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_VXLAN);
} }
/** /**
@ -3716,7 +3715,7 @@ nm_connection_get_setting_vxlan(NMConnection *connection)
NMSettingWimax * NMSettingWimax *
nm_connection_get_setting_wimax(NMConnection *connection) nm_connection_get_setting_wimax(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_WIMAX); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_WIMAX);
} }
/** /**
@ -3730,7 +3729,7 @@ nm_connection_get_setting_wimax(NMConnection *connection)
NMSettingWired * NMSettingWired *
nm_connection_get_setting_wired(NMConnection *connection) nm_connection_get_setting_wired(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_WIRED); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_WIRED);
} }
/** /**
@ -3744,7 +3743,7 @@ nm_connection_get_setting_wired(NMConnection *connection)
NMSettingAdsl * NMSettingAdsl *
nm_connection_get_setting_adsl(NMConnection *connection) nm_connection_get_setting_adsl(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_ADSL); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_ADSL);
} }
/** /**
@ -3758,7 +3757,7 @@ nm_connection_get_setting_adsl(NMConnection *connection)
NMSettingWireless * NMSettingWireless *
nm_connection_get_setting_wireless(NMConnection *connection) nm_connection_get_setting_wireless(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_WIRELESS); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_WIRELESS);
} }
/** /**
@ -3772,8 +3771,8 @@ nm_connection_get_setting_wireless(NMConnection *connection)
NMSettingWirelessSecurity * NMSettingWirelessSecurity *
nm_connection_get_setting_wireless_security(NMConnection *connection) nm_connection_get_setting_wireless_security(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, return _nm_connection_get_setting_by_metatype(connection,
NM_META_SETTING_TYPE_WIRELESS_SECURITY); NM_META_SETTING_TYPE_WIRELESS_SECURITY);
} }
/** /**
@ -3787,7 +3786,7 @@ nm_connection_get_setting_wireless_security(NMConnection *connection)
NMSettingBridgePort * NMSettingBridgePort *
nm_connection_get_setting_bridge_port(NMConnection *connection) nm_connection_get_setting_bridge_port(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_BRIDGE_PORT); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_BRIDGE_PORT);
} }
/** /**
@ -3801,7 +3800,7 @@ nm_connection_get_setting_bridge_port(NMConnection *connection)
NMSettingVlan * NMSettingVlan *
nm_connection_get_setting_vlan(NMConnection *connection) nm_connection_get_setting_vlan(NMConnection *connection)
{ {
return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_VLAN); return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_VLAN);
} }
NMSettingBluetooth * NMSettingBluetooth *