colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wwan/trivial: rename NMModemClass.check_connection_compatible() to use unique name

Browse Source 
We also have NMDeviceClass.check_connection_compatible(). It is preferable
to use unique names, especially for the virtual function table. A reasonable
thing to do is grep for the function name to find all places that implement
this function. But if different classes use the same name, grep just
turns up annoying false positives.
This commit is contained in:
Thomas Haller
2018-07-09 17:03:35 +02:00
parent 0ee782d03e
commit 39f47e2f7e
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -617,7 +617,7 @@ act_stage1_prepare (NMModem *_self,
/*****************************************************************************/ /*****************************************************************************/
static gboolean static gboolean
check_connection_compatible (NMModem *_self, NMConnection *connection) check_connection_compatible_with_modem (NMModem *_self, NMConnection *connection)
{ {
NMModemBroadband *self = NM_MODEM_BROADBAND (_self); NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
MMModemCapability modem_caps; MMModemCapability modem_caps;
@@ -1476,7 +1476,7 @@ nm_modem_broadband_class_init (NMModemBroadbandClass *klass)
modem_class->deactivate_cleanup = deactivate_cleanup; modem_class->deactivate_cleanup = deactivate_cleanup;
modem_class->set_mm_enabled = set_mm_enabled; modem_class->set_mm_enabled = set_mm_enabled;
modem_class->get_user_pass = get_user_pass; modem_class->get_user_pass = get_user_pass;
modem_class->check_connection_compatible = check_connection_compatible; 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->act_stage1_prepare = act_stage1_prepare;
modem_class->owns_port = owns_port; modem_class->owns_port = owns_port;

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

@@ -279,7 +279,7 @@ deactivate_cleanup (NMModem *modem, NMDevice *device)
} }
static gboolean static gboolean
check_connection_compatible (NMModem *modem, check_connection_compatible_with_modem (NMModem *modem,
NMConnection *connection) NMConnection *connection)
{ {
NMModemOfono *self = NM_MODEM_OFONO (modem); NMModemOfono *self = NM_MODEM_OFONO (modem);
@@ -1326,7 +1326,7 @@ nm_modem_ofono_class_init (NMModemOfonoClass *klass)
modem_class->disconnect = disconnect; modem_class->disconnect = disconnect;
modem_class->disconnect_finish = disconnect_finish; modem_class->disconnect_finish = disconnect_finish;
modem_class->deactivate_cleanup = deactivate_cleanup; modem_class->deactivate_cleanup = deactivate_cleanup;
modem_class->check_connection_compatible = check_connection_compatible; modem_class->check_connection_compatible_with_modem = check_connection_compatible_with_modem;
modem_class->act_stage1_prepare = act_stage1_prepare; modem_class->act_stage1_prepare = 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;

4
src/devices/wwan/nm-modem.c
View File

@@ -1086,8 +1086,8 @@ nm_modem_check_connection_compatible (NMModem *self, NMConnection *connection)
} }
} }
if (NM_MODEM_GET_CLASS (self)->check_connection_compatible) if (NM_MODEM_GET_CLASS (self)->check_connection_compatible_with_modem)
return NM_MODEM_GET_CLASS (self)->check_connection_compatible (self, connection); return NM_MODEM_GET_CLASS (self)->check_connection_compatible_with_modem (self, connection);
return FALSE; return FALSE;
} }

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

@@ -121,7 +121,7 @@ typedef struct {
const char **user, const char **user,
const char **pass); const char **pass);
gboolean (*check_connection_compatible) (NMModem *modem, gboolean (*check_connection_compatible_with_modem) (NMModem *modem,
NMConnection *connection); NMConnection *connection);
gboolean (*complete_connection) (NMModem *modem, gboolean (*complete_connection) (NMModem *modem,