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

modem/trivial: rename virtual function NMModemClass.act_stage1_prepare()

Browse source 
NMDeviceClass already has a function with this name. It's confusing
to have multiple virtual functions named the same. Rename.
This commit is contained in:
Thomas Haller 2019-08-21 13:10:24 +02:00
parent 8b121c7048
commit 96cd0ca62f
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/wwan/nm-modem-broadband.c
View file

@ -586,7 +586,7 @@ connect_context_step (NMModemBroadband *self)
} }
static NMActStageReturn static NMActStageReturn
act_stage1_prepare (NMModem *_self, modem_act_stage1_prepare (NMModem *_self,
NMConnection *connection, NMConnection *connection,
NMDeviceStateReason *out_failure_reason) NMDeviceStateReason *out_failure_reason)
{ {
@ -1512,7 +1512,7 @@ nm_modem_broadband_class_init (NMModemBroadbandClass *klass)
modem_class->get_user_pass = get_user_pass; modem_class->get_user_pass = get_user_pass;
modem_class->check_connection_compatible_with_modem = check_connection_compatible_with_modem; modem_class->check_connection_compatible_with_modem = check_connection_compatible_with_modem;
modem_class->complete_connection = complete_connection; modem_class->complete_connection = complete_connection;
modem_class->act_stage1_prepare = act_stage1_prepare; modem_class->modem_act_stage1_prepare = modem_act_stage1_prepare;
modem_class->owns_port = owns_port; modem_class->owns_port = owns_port;
obj_properties[PROP_MODEM] = obj_properties[PROP_MODEM] =

4
src/devices/wwan/nm-modem-ofono.c
View file

@ -1114,7 +1114,7 @@ create_connect_properties (NMConnection *connection)
} }
static NMActStageReturn static NMActStageReturn
act_stage1_prepare (NMModem *modem, modem_act_stage1_prepare (NMModem *modem,
NMConnection *connection, NMConnection *connection,
NMDeviceStateReason *out_failure_reason) NMDeviceStateReason *out_failure_reason)
{ {
@ -1308,6 +1308,6 @@ nm_modem_ofono_class_init (NMModemOfonoClass *klass)
modem_class->deactivate_cleanup = deactivate_cleanup; modem_class->deactivate_cleanup = deactivate_cleanup;
modem_class->check_connection_compatible_with_modem = check_connection_compatible_with_modem; modem_class->check_connection_compatible_with_modem = check_connection_compatible_with_modem;
modem_class->act_stage1_prepare = act_stage1_prepare; modem_class->modem_act_stage1_prepare = modem_act_stage1_prepare;
modem_class->static_stage3_ip4_config_start = static_stage3_ip4_config_start; modem_class->static_stage3_ip4_config_start = static_stage3_ip4_config_start;
} }

6
src/devices/wwan/nm-modem.c
View file

@ -974,7 +974,7 @@ nm_modem_get_secrets (NMModem *self,
/*****************************************************************************/ /*****************************************************************************/
static NMActStageReturn static NMActStageReturn
act_stage1_prepare (NMModem *modem, modem_act_stage1_prepare (NMModem *modem,
NMConnection *connection, NMConnection *connection,
NMDeviceStateReason *out_failure_reason) NMDeviceStateReason *out_failure_reason)
{ {
@ -1003,7 +1003,7 @@ nm_modem_act_stage1_prepare (NMModem *self,
setting_name = nm_connection_need_secrets (connection, &hints); setting_name = nm_connection_need_secrets (connection, &hints);
if (!setting_name) { if (!setting_name) {
nm_assert (!hints); nm_assert (!hints);
return NM_MODEM_GET_CLASS (self)->act_stage1_prepare (self, connection, out_failure_reason); return NM_MODEM_GET_CLASS (self)->modem_act_stage1_prepare (self, connection, out_failure_reason);
} }
/* Secrets required... */ /* Secrets required... */
@ -1798,7 +1798,7 @@ nm_modem_class_init (NMModemClass *klass)
object_class->dispose = dispose; object_class->dispose = dispose;
object_class->finalize = finalize; object_class->finalize = finalize;
klass->act_stage1_prepare = act_stage1_prepare; klass->modem_act_stage1_prepare = modem_act_stage1_prepare;
klass->stage3_ip6_config_request = stage3_ip6_config_request; klass->stage3_ip6_config_request = stage3_ip6_config_request;
klass->deactivate_cleanup = deactivate_cleanup; klass->deactivate_cleanup = deactivate_cleanup;

2
src/devices/wwan/nm-modem.h
View file

@ -136,7 +136,7 @@ typedef struct {
NMConnection *const*existing_connections, NMConnection *const*existing_connections,
GError **error); GError **error);
NMActStageReturn (*act_stage1_prepare) (NMModem *modem, NMActStageReturn (*modem_act_stage1_prepare) (NMModem *modem,
NMConnection *connection, NMConnection *connection,
NMDeviceStateReason *out_failure_reason); NMDeviceStateReason *out_failure_reason);