diff options
author | Aleksander Morgado <aleksander@aleksander.es> | 2021-11-04 22:44:20 +0100 |
---|---|---|
committer | Aleksander Morgado <aleksander@aleksander.es> | 2021-11-04 22:44:20 +0100 |
commit | 9f679d4cacde106a14ac68350c7173d31c1a3e5d (patch) | |
tree | 01215e916766070aeb2873fac07448c140f0f6e4 | |
parent | 3444b029324bb2bd54a6bbd486792d49619e9383 (diff) |
core: replace 'dummy' with 'placeholder'
-rw-r--r-- | plugins/tests/gsm-port.conf | 8 | ||||
-rw-r--r-- | plugins/tests/test-keyfiles.c | 6 | ||||
-rw-r--r-- | plugins/tests/test-udev-rules.c | 6 | ||||
-rw-r--r-- | src/mm-broadband-modem-mbim.c | 2 | ||||
-rw-r--r-- | src/mm-broadband-modem-qmi.c | 2 | ||||
-rw-r--r-- | src/mm-shared-qmi.c | 20 | ||||
-rwxr-xr-x | test/mmcli-test-sms | 2 |
7 files changed, 23 insertions, 23 deletions
diff --git a/plugins/tests/gsm-port.conf b/plugins/tests/gsm-port.conf index 34403805..ae157834 100644 --- a/plugins/tests/gsm-port.conf +++ b/plugins/tests/gsm-port.conf @@ -8,11 +8,11 @@ ATX4 \r\nOK\r\n AT&C1 \r\nOK\r\n AT+IFC=1,1 \r\nOK\r\n AT+GCAP \r\n+GCAP: +CGSM +DS +ES\r\n\r\nOK\r\n -ATI \r\nManufacturer: Dummy vendor\r\nModel: Dummy model\r\nRevision: Dummy revision\r\nIMEI: 001100110011002<CR><LF>+GCAP: +CGSM,+DS,+ES\r\n\r\nOK\r\n +ATI \r\nManufacturer: Some vendor\r\nModel: Some model\r\nRevision: Some revision\r\nIMEI: 001100110011002<CR><LF>+GCAP: +CGSM,+DS,+ES\r\n\r\nOK\r\n AT+WS46=? \r\n+WS46: (12,22)\r\n\r\nOK\r\n -AT+CGMI \r\nDummy vendor\r\n\r\nOK\r\n -AT+CGMM \r\nDummy model\r\n\r\nOK\r\n -AT+CGMR \r\nDummy revision\r\n\r\nOK\r\n +AT+CGMI \r\nSome vendor\r\n\r\nOK\r\n +AT+CGMM \r\nSome model\r\n\r\nOK\r\n +AT+CGMR \r\nSome revision\r\n\r\nOK\r\n AT+CGSN \r\n123456789012345\r\n\r\nOK\r\n AT+CGDCONT=? \r\n+CGDCONT: (1-11),"IP",,,(0-2),(0-3)\r\n+CGDCONT: (1-11),"IPV6",,,(0-2),(0-3)\r\n+CGDCONT: (1-11),"IPV4V6",,,(0-2),(0-3)\r\n+CGDCONT: (1-11),"PPP",,,(0-2),(0-3)\r\n\r\nOK\r\n AT+CIMI \r\n998899889988997\r\n\r\nOK\r\n diff --git a/plugins/tests/test-keyfiles.c b/plugins/tests/test-keyfiles.c index d528cac9..f92df9c3 100644 --- a/plugins/tests/test-keyfiles.c +++ b/plugins/tests/test-keyfiles.c @@ -44,10 +44,10 @@ common_test (const gchar *keyfile_path) g_key_file_unref (keyfile); } -/* Dummy test to avoid compiler warning about common_test() being unused +/* Placeholder test to avoid compiler warning about common_test() being unused * when none of the plugins enabled in build have custom key files. */ static void -test_dummy (void) +test_placeholder (void) { common_test (NULL); } @@ -69,7 +69,7 @@ int main (int argc, char **argv) setlocale (LC_ALL, ""); g_test_init (&argc, &argv, NULL); - g_test_add_func ("/MM/test-keyfiles/dummy", test_dummy); + g_test_add_func ("/MM/test-keyfiles/placeholder", test_placeholder); #if defined ENABLE_PLUGIN_FOXCONN g_test_add_func ("/MM/test-keyfiles/foxconn/t77w968", test_foxconn_t77w968); diff --git a/plugins/tests/test-udev-rules.c b/plugins/tests/test-udev-rules.c index 2f7190f1..b7f06d35 100644 --- a/plugins/tests/test-udev-rules.c +++ b/plugins/tests/test-udev-rules.c @@ -46,10 +46,10 @@ common_test (const gchar *plugindir) g_array_unref (rules); } -/* Dummy test to avoid compiler warning about common_test() being unused +/* Placeholder test to avoid compiler warning about common_test() being unused * when none of the plugins enabled in build have custom udev rules. */ static void -test_dummy (void) +test_placeholder (void) { common_test (NULL); } @@ -191,7 +191,7 @@ int main (int argc, char **argv) setlocale (LC_ALL, ""); g_test_init (&argc, &argv, NULL); - g_test_add_func ("/MM/test-udev-rules/dummy", test_dummy); + g_test_add_func ("/MM/test-udev-rules/placeholder", test_placeholder); #if defined ENABLE_PLUGIN_HUAWEI g_test_add_func ("/MM/test-udev-rules/huawei", test_huawei); diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index f7ed6cdd..2a68c8f6 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -881,7 +881,7 @@ modem_load_device_identifier (MMIfaceModem *self, task = g_task_new (self, NULL, callback, user_data); - /* Just use dummy ATI/ATI1 replies, all the other internal info should be + /* Just use placeholder ATI/ATI1 replies, all the other internal info should be * enough for uniqueness */ device_identifier = mm_broadband_modem_create_device_identifier (MM_BROADBAND_MODEM (self), "", "", &error); if (!device_identifier) diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index a79cc981..8ab0662d 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -711,7 +711,7 @@ modem_load_device_identifier (MMIfaceModem *self, mm_obj_dbg (self, "loading device identifier..."); - /* Just use dummy ATI/ATI1 replies, all the other internal info should be + /* Just use placeholder ATI/ATI1 replies, all the other internal info should be * enough for uniqueness */ device_identifier = mm_broadband_modem_create_device_identifier (MM_BROADBAND_MODEM (self), "", "", &error); if (!device_identifier) diff --git a/src/mm-shared-qmi.c b/src/mm-shared-qmi.c index cb932aee..f829856c 100644 --- a/src/mm-shared-qmi.c +++ b/src/mm-shared-qmi.c @@ -3616,15 +3616,15 @@ uim_refresh_complete (QmiClientUim *client, QmiUimSessionType session_type) { g_autoptr(QmiMessageUimRefreshCompleteInput) refresh_complete_input = NULL; - GArray *dummy_aid; + GArray *placeholder_aid; - dummy_aid = g_array_new (FALSE, FALSE, sizeof (guint8)); + placeholder_aid = g_array_new (FALSE, FALSE, sizeof (guint8)); refresh_complete_input = qmi_message_uim_refresh_complete_input_new (); qmi_message_uim_refresh_complete_input_set_session ( refresh_complete_input, session_type, - dummy_aid, /* ignored */ + placeholder_aid, /* ignored */ NULL); qmi_message_uim_refresh_complete_input_set_info ( refresh_complete_input, @@ -3638,7 +3638,7 @@ uim_refresh_complete (QmiClientUim *client, NULL, NULL, NULL); - g_array_unref (dummy_aid); + g_array_unref (placeholder_aid); } static gboolean @@ -3916,7 +3916,7 @@ uim_refresh_register_iccid_change (GTask *task) QmiMessageUimRefreshRegisterInputInfoFilesElement file_element; guint8 val; g_autoptr(QmiMessageUimRefreshRegisterInput) refresh_register_input = NULL; - g_autoptr(GArray) dummy_aid = NULL; + g_autoptr(GArray) placeholder_aid = NULL; g_autoptr(GArray) file = NULL; g_autoptr(GArray) file_element_path = NULL; @@ -3925,7 +3925,7 @@ uim_refresh_register_iccid_change (GTask *task) mm_obj_dbg (self, "register for refresh file indication"); - dummy_aid = g_array_new (FALSE, FALSE, sizeof (guint8)); + placeholder_aid = g_array_new (FALSE, FALSE, sizeof (guint8)); file = g_array_sized_new (FALSE, FALSE, sizeof (QmiMessageUimRefreshRegisterInputInfoFilesElement), 1); @@ -3949,7 +3949,7 @@ uim_refresh_register_iccid_change (GTask *task) NULL); qmi_message_uim_refresh_register_input_set_session (refresh_register_input, QMI_UIM_SESSION_TYPE_PRIMARY_GW_PROVISIONING, - dummy_aid, + placeholder_aid, NULL); qmi_client_uim_refresh_register (QMI_CLIENT_UIM (priv->uim_client), @@ -4013,7 +4013,7 @@ uim_slot_status_not_supported (GTask *task) MMIfaceModem *self; Private *priv; g_autoptr(QmiMessageUimRefreshRegisterAllInput) refresh_register_all_input = NULL; - g_autoptr(GArray) dummy_aid = NULL; + g_autoptr(GArray) placeholder_aid = NULL; self = g_task_get_source_object (task); priv = get_private (MM_SHARED_QMI (self)); @@ -4022,7 +4022,7 @@ uim_slot_status_not_supported (GTask *task) mm_obj_dbg (self, "slot status not supported by modem: register for refresh indications"); - dummy_aid = g_array_new (FALSE, FALSE, sizeof (guint8)); + placeholder_aid = g_array_new (FALSE, FALSE, sizeof (guint8)); refresh_register_all_input = qmi_message_uim_refresh_register_all_input_new (); qmi_message_uim_refresh_register_all_input_set_info (refresh_register_all_input, @@ -4030,7 +4030,7 @@ uim_slot_status_not_supported (GTask *task) NULL); qmi_message_uim_refresh_register_all_input_set_session (refresh_register_all_input, QMI_UIM_SESSION_TYPE_CARD_SLOT_1, - dummy_aid, + placeholder_aid, NULL); qmi_client_uim_refresh_register_all (QMI_CLIENT_UIM (priv->uim_client), diff --git a/test/mmcli-test-sms b/test/mmcli-test-sms index 18e0a7b4..038d777d 100755 --- a/test/mmcli-test-sms +++ b/test/mmcli-test-sms @@ -2,7 +2,7 @@ print_usage () { echo "usage: $0 [MODEM INDEX] [all|ucs2|gsm7|data] [NUMBER]" - echo " if no [NUMBER] is given, a dummy one will be used and no SMS will be sent" + echo " if no [NUMBER] is given, a placeholder one will be used and no SMS will be sent" } test () { |