fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 17:50:14 +01: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

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

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

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

@ -1114,9 +1114,9 @@ create_connect_properties (NMConnection *connection)
}
static NMActStageReturn
act_stage1_prepare (NMModem *modem,
NMConnection *connection,
NMDeviceStateReason *out_failure_reason)
modem_act_stage1_prepare (NMModem *modem,
NMConnection *connection,
NMDeviceStateReason *out_failure_reason)
{
NMModemOfono *self = NM_MODEM_OFONO (modem);
NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
@ -1308,6 +1308,6 @@ nm_modem_ofono_class_init (NMModemOfonoClass *klass)
modem_class->deactivate_cleanup = deactivate_cleanup;
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;
}

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

@ -974,9 +974,9 @@ nm_modem_get_secrets (NMModem *self,
/*****************************************************************************/
static NMActStageReturn
act_stage1_prepare (NMModem *modem,
NMConnection *connection,
NMDeviceStateReason *out_failure_reason)
modem_act_stage1_prepare (NMModem *modem,
NMConnection *connection,
NMDeviceStateReason *out_failure_reason)
{
NM_SET_OUT (out_failure_reason, NM_DEVICE_STATE_REASON_UNKNOWN);
return NM_ACT_STAGE_RETURN_FAILURE;
@ -1003,7 +1003,7 @@ nm_modem_act_stage1_prepare (NMModem *self,
setting_name = nm_connection_need_secrets (connection, &hints);
if (!setting_name) {
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... */
@ -1798,7 +1798,7 @@ nm_modem_class_init (NMModemClass *klass)
object_class->dispose = dispose;
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->deactivate_cleanup = deactivate_cleanup;

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

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