From 27cbf584bdb7451e196b03b706c4c4dfa266ba3e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 3 May 2023 11:43:33 +0200 Subject: libnm/trivial: rename internal connection-get-setting methods This function will be exposed on the internal header. Rename to _nm_connection_get_setting_by_metatype(). --- src/libnm-core-impl/nm-connection.c | 81 ++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index 9a7ad1c603..39540edd42 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -313,7 +313,7 @@ _connection_get_setting_check(NMConnection *connection, GType setting_type) } 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); @@ -3262,7 +3262,7 @@ nm_connection_get_virtual_device_description(NMConnection *connection) NMSetting8021x * 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); } /** @@ -3276,7 +3276,7 @@ nm_connection_get_setting_802_1x(NMConnection *connection) NMSettingBluetooth * 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); } /** @@ -3290,7 +3290,7 @@ nm_connection_get_setting_bluetooth(NMConnection *connection) NMSettingBond * 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); } /** @@ -3304,7 +3304,7 @@ nm_connection_get_setting_bond(NMConnection *connection) NMSettingTeam * 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); } /** @@ -3318,7 +3318,7 @@ nm_connection_get_setting_team(NMConnection *connection) NMSettingTeamPort * 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); } /** @@ -3332,7 +3332,7 @@ nm_connection_get_setting_team_port(NMConnection *connection) NMSettingBridge * 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); } /** @@ -3346,7 +3346,7 @@ nm_connection_get_setting_bridge(NMConnection *connection) NMSettingCdma * 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); } /** @@ -3360,7 +3360,7 @@ nm_connection_get_setting_cdma(NMConnection *connection) NMSettingConnection * 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); } /** @@ -3374,7 +3374,7 @@ nm_connection_get_setting_connection(NMConnection *connection) NMSettingDcb * 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); } /** @@ -3390,7 +3390,7 @@ nm_connection_get_setting_dcb(NMConnection *connection) NMSettingDummy * 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); } /** @@ -3404,7 +3404,7 @@ nm_connection_get_setting_dummy(NMConnection *connection) NMSettingGeneric * 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); } /** @@ -3418,7 +3418,7 @@ nm_connection_get_setting_generic(NMConnection *connection) NMSettingGsm * 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); } /** @@ -3432,7 +3432,7 @@ nm_connection_get_setting_gsm(NMConnection *connection) NMSettingInfiniband * 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); } /** @@ -3451,7 +3451,7 @@ nm_connection_get_setting_infiniband(NMConnection *connection) NMSettingIPConfig * 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); } /** @@ -3467,7 +3467,7 @@ nm_connection_get_setting_ip4_config(NMConnection *connection) NMSettingIPTunnel * 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); } /** @@ -3486,7 +3486,7 @@ nm_connection_get_setting_ip_tunnel(NMConnection *connection) NMSettingIPConfig * 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); } /** @@ -3502,7 +3502,7 @@ nm_connection_get_setting_ip6_config(NMConnection *connection) NMSettingMacsec * 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); } /** @@ -3518,7 +3518,7 @@ nm_connection_get_setting_macsec(NMConnection *connection) NMSettingMacvlan * 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); } /** @@ -3532,7 +3532,7 @@ nm_connection_get_setting_macvlan(NMConnection *connection) NMSettingOlpcMesh * 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); } /** @@ -3548,7 +3548,7 @@ nm_connection_get_setting_olpc_mesh(NMConnection *connection) NMSettingOvsBridge * 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); } /** @@ -3564,8 +3564,7 @@ nm_connection_get_setting_ovs_bridge(NMConnection *connection) NMSettingOvsInterface * nm_connection_get_setting_ovs_interface(NMConnection *connection) { - return _connection_get_setting_by_meta_type_check(connection, - NM_META_SETTING_TYPE_OVS_INTERFACE); + return _nm_connection_get_setting_by_metatype(connection, NM_META_SETTING_TYPE_OVS_INTERFACE); } /** @@ -3581,7 +3580,7 @@ nm_connection_get_setting_ovs_interface(NMConnection *connection) NMSettingOvsPatch * 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); } /** @@ -3597,7 +3596,7 @@ nm_connection_get_setting_ovs_patch(NMConnection *connection) NMSettingOvsPort * 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); } /** @@ -3611,7 +3610,7 @@ nm_connection_get_setting_ovs_port(NMConnection *connection) NMSettingPpp * 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); } /** @@ -3625,7 +3624,7 @@ nm_connection_get_setting_ppp(NMConnection *connection) NMSettingPppoe * 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); } /** @@ -3641,7 +3640,7 @@ nm_connection_get_setting_pppoe(NMConnection *connection) NMSettingProxy * 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); } /** @@ -3655,7 +3654,7 @@ nm_connection_get_setting_proxy(NMConnection *connection) NMSettingSerial * 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); } /** @@ -3671,7 +3670,7 @@ nm_connection_get_setting_serial(NMConnection *connection) NMSettingTCConfig * 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); } /** @@ -3687,7 +3686,7 @@ nm_connection_get_setting_tc_config(NMConnection *connection) NMSettingTun * 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); } /** @@ -3701,7 +3700,7 @@ nm_connection_get_setting_tun(NMConnection *connection) NMSettingVpn * 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); } /** @@ -3717,7 +3716,7 @@ nm_connection_get_setting_vpn(NMConnection *connection) NMSettingVxlan * 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); } /** @@ -3731,7 +3730,7 @@ nm_connection_get_setting_vxlan(NMConnection *connection) NMSettingWimax * 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); } /** @@ -3745,7 +3744,7 @@ nm_connection_get_setting_wimax(NMConnection *connection) NMSettingWired * 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); } /** @@ -3759,7 +3758,7 @@ nm_connection_get_setting_wired(NMConnection *connection) NMSettingAdsl * 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); } /** @@ -3773,7 +3772,7 @@ nm_connection_get_setting_adsl(NMConnection *connection) NMSettingWireless * 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); } /** @@ -3787,8 +3786,8 @@ nm_connection_get_setting_wireless(NMConnection *connection) NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security(NMConnection *connection) { - return _connection_get_setting_by_meta_type_check(connection, - NM_META_SETTING_TYPE_WIRELESS_SECURITY); + return _nm_connection_get_setting_by_metatype(connection, + NM_META_SETTING_TYPE_WIRELESS_SECURITY); } /** @@ -3802,7 +3801,7 @@ nm_connection_get_setting_wireless_security(NMConnection *connection) NMSettingBridgePort * 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); } /** @@ -3816,7 +3815,7 @@ nm_connection_get_setting_bridge_port(NMConnection *connection) NMSettingVlan * 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 * -- cgit v1.2.1