qmicli: avoid redefining shutdown()

8 files changed, 284 insertions, 284 deletions

diff --git a/src/qmicli/qmicli-dms.c b/src/qmicli/qmicli-dms.c
index 6f259f9..aa58f76 100644
--- a/src/qmicli/qmicli-dms.c
+++ b/src/qmicli/qmicli-dms.c
@@ -355,7 +355,7 @@ context_free (Context *context)
 }
 
 static void
-shutdown (gboolean operation_status)
+operation_shutdown (gboolean operation_status)
 {
     /* Cleanup context and finish async operation */
     context_free (ctx);
@@ -376,7 +376,7 @@ get_ids_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -384,7 +384,7 @@ get_ids_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get IDs: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_ids_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -405,7 +405,7 @@ get_ids_ready (QmiClientDms *client,
              VALIDATE_UNKNOWN (meid));
 
     qmi_message_dms_get_ids_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -426,7 +426,7 @@ get_capabilities_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -434,7 +434,7 @@ get_capabilities_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get capabilities: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_capabilities_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -472,7 +472,7 @@ get_capabilities_ready (QmiClientDms *client,
 
     g_string_free (networks, TRUE);
     qmi_message_dms_get_capabilities_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -487,7 +487,7 @@ get_manufacturer_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -495,7 +495,7 @@ get_manufacturer_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get manufacturer: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_manufacturer_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -510,7 +510,7 @@ get_manufacturer_ready (QmiClientDms *client,
              VALIDATE_UNKNOWN (str));
 
     qmi_message_dms_get_manufacturer_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -525,7 +525,7 @@ get_model_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -533,7 +533,7 @@ get_model_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get model: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_model_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -548,7 +548,7 @@ get_model_ready (QmiClientDms *client,
              VALIDATE_UNKNOWN (str));
 
     qmi_message_dms_get_model_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -563,7 +563,7 @@ get_revision_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -571,7 +571,7 @@ get_revision_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get revision: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_revision_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -586,7 +586,7 @@ get_revision_ready (QmiClientDms *client,
              VALIDATE_UNKNOWN (str));
 
     qmi_message_dms_get_revision_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -601,7 +601,7 @@ get_msisdn_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -609,7 +609,7 @@ get_msisdn_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get MSISDN: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_msisdn_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -624,7 +624,7 @@ get_msisdn_ready (QmiClientDms *client,
              VALIDATE_UNKNOWN (str));
 
     qmi_message_dms_get_msisdn_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -641,7 +641,7 @@ get_power_state_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -649,7 +649,7 @@ get_power_state_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get power state: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_power_state_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -668,7 +668,7 @@ get_power_state_ready (QmiClientDms *client,
 
     g_free (power_state_str);
     qmi_message_dms_get_power_state_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsUimSetPinProtectionInput *
@@ -720,7 +720,7 @@ uim_set_pin_protection_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -745,7 +745,7 @@ uim_set_pin_protection_ready (QmiClientDms *client,
         }
 
         qmi_message_dms_uim_set_pin_protection_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -753,7 +753,7 @@ uim_set_pin_protection_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_uim_set_pin_protection_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsUimVerifyPinInput *
@@ -802,7 +802,7 @@ uim_verify_pin_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -827,7 +827,7 @@ uim_verify_pin_ready (QmiClientDms *client,
         }
 
         qmi_message_dms_uim_verify_pin_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -835,7 +835,7 @@ uim_verify_pin_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_uim_verify_pin_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsUimUnblockPinInput *
@@ -887,7 +887,7 @@ uim_unblock_pin_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -912,7 +912,7 @@ uim_unblock_pin_ready (QmiClientDms *client,
         }
 
         qmi_message_dms_uim_unblock_pin_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -920,7 +920,7 @@ uim_unblock_pin_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_uim_unblock_pin_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsUimChangePinInput *
@@ -972,7 +972,7 @@ uim_change_pin_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -997,7 +997,7 @@ uim_change_pin_ready (QmiClientDms *client,
         }
 
         qmi_message_dms_uim_change_pin_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1005,7 +1005,7 @@ uim_change_pin_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_uim_change_pin_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1022,7 +1022,7 @@ uim_get_pin_status_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1030,7 +1030,7 @@ uim_get_pin_status_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get PIN status: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_uim_get_pin_status_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1070,7 +1070,7 @@ uim_get_pin_status_ready (QmiClientDms *client,
     }
 
     qmi_message_dms_uim_get_pin_status_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1085,7 +1085,7 @@ uim_get_iccid_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1093,7 +1093,7 @@ uim_get_iccid_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get ICCID: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_uim_get_iccid_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1108,7 +1108,7 @@ uim_get_iccid_ready (QmiClientDms *client,
              VALIDATE_UNKNOWN (str));
 
     qmi_message_dms_uim_get_iccid_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1123,7 +1123,7 @@ uim_get_imsi_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1131,7 +1131,7 @@ uim_get_imsi_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get IMSI: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_uim_get_imsi_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1146,7 +1146,7 @@ uim_get_imsi_ready (QmiClientDms *client,
              VALIDATE_UNKNOWN (str));
 
     qmi_message_dms_uim_get_imsi_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1161,7 +1161,7 @@ uim_get_state_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1169,7 +1169,7 @@ uim_get_state_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get UIM state: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_uim_get_state_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1181,7 +1181,7 @@ uim_get_state_ready (QmiClientDms *client,
              qmi_dms_uim_state_get_string (state));
 
     qmi_message_dms_uim_get_state_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsUimGetCkStatusInput *
@@ -1224,7 +1224,7 @@ uim_get_ck_status_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1232,7 +1232,7 @@ uim_get_ck_status_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get UIM CK status: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_uim_get_ck_status_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1264,7 +1264,7 @@ uim_get_ck_status_ready (QmiClientDms *client,
     }
 
     qmi_message_dms_uim_get_ck_status_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsUimSetCkProtectionInput *
@@ -1322,7 +1322,7 @@ uim_set_ck_protection_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1343,7 +1343,7 @@ uim_set_ck_protection_ready (QmiClientDms *client,
         }
 
         qmi_message_dms_uim_set_ck_protection_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1351,7 +1351,7 @@ uim_set_ck_protection_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_uim_set_ck_protection_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsUimUnblockCkInput *
@@ -1400,7 +1400,7 @@ uim_unblock_ck_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1421,7 +1421,7 @@ uim_unblock_ck_ready (QmiClientDms *client,
         }
 
         qmi_message_dms_uim_unblock_ck_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1429,7 +1429,7 @@ uim_unblock_ck_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_uim_unblock_ck_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1444,7 +1444,7 @@ get_hardware_revision_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1452,7 +1452,7 @@ get_hardware_revision_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get the HW revision: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_hardware_revision_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1467,7 +1467,7 @@ get_hardware_revision_ready (QmiClientDms *client,
              VALIDATE_UNKNOWN (str));
 
     qmi_message_dms_get_hardware_revision_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1483,7 +1483,7 @@ get_operating_mode_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1491,7 +1491,7 @@ get_operating_mode_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get the HW revision: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_operating_mode_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1521,7 +1521,7 @@ get_operating_mode_ready (QmiClientDms *client,
     g_print ("\tHW restricted: '%s'\n", hw_restricted ? "yes" : "no");
 
     qmi_message_dms_get_operating_mode_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsSetOperatingModeInput *
@@ -1560,7 +1560,7 @@ set_operating_mode_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1568,7 +1568,7 @@ set_operating_mode_ready (QmiClientDms *client,
         g_printerr ("error: couldn't set operating mode: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_set_operating_mode_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1576,7 +1576,7 @@ set_operating_mode_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_set_operating_mode_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1596,7 +1596,7 @@ get_time_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1604,7 +1604,7 @@ get_time_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get the device time: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_time_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1657,7 +1657,7 @@ get_time_ready (QmiClientDms *client,
     g_time_zone_unref (time_zone);
 
     qmi_message_dms_get_time_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1673,7 +1673,7 @@ get_prl_version_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1681,7 +1681,7 @@ get_prl_version_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get the PRL version: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_prl_version_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1704,7 +1704,7 @@ get_prl_version_ready (QmiClientDms *client,
     }
 
     qmi_message_dms_get_prl_version_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1719,7 +1719,7 @@ get_activation_state_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1727,7 +1727,7 @@ get_activation_state_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get the state of the service activation: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_activation_state_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1742,7 +1742,7 @@ get_activation_state_ready (QmiClientDms *client,
              qmi_dms_activation_state_get_string (activation_state));
 
     qmi_message_dms_get_activation_state_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsActivateManualInput *
@@ -1797,7 +1797,7 @@ activate_manual_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1805,12 +1805,12 @@ activate_manual_ready (QmiClientDms *client,
         g_printerr ("error: couldn't request manual service activation: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_activate_manual_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
     qmi_message_dms_activate_manual_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsActivateAutomaticInput *
@@ -1845,7 +1845,7 @@ activate_automatic_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1853,12 +1853,12 @@ activate_automatic_ready (QmiClientDms *client,
         g_printerr ("error: couldn't request automatic service activation: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_activate_automatic_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
     qmi_message_dms_activate_automatic_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1873,7 +1873,7 @@ get_user_lock_state_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1881,7 +1881,7 @@ get_user_lock_state_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get the state of the user lock: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_user_lock_state_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1896,7 +1896,7 @@ get_user_lock_state_ready (QmiClientDms *client,
              enabled ? "yes" : "no");
 
     qmi_message_dms_get_user_lock_state_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsSetUserLockStateInput *
@@ -1946,7 +1946,7 @@ set_user_lock_state_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1954,7 +1954,7 @@ set_user_lock_state_ready (QmiClientDms *client,
         g_printerr ("error: couldn't set state of the user lock: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_set_user_lock_state_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1962,7 +1962,7 @@ set_user_lock_state_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_set_user_lock_state_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsSetUserLockCodeInput *
@@ -2011,7 +2011,7 @@ set_user_lock_code_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2019,7 +2019,7 @@ set_user_lock_code_ready (QmiClientDms *client,
         g_printerr ("error: couldn't change user lock code: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_set_user_lock_code_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2027,7 +2027,7 @@ set_user_lock_code_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_set_user_lock_code_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -2043,7 +2043,7 @@ read_user_data_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2051,7 +2051,7 @@ read_user_data_ready (QmiClientDms *client,
         g_printerr ("error: couldn't read user data: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_read_user_data_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2071,7 +2071,7 @@ read_user_data_ready (QmiClientDms *client,
     g_free (user_data_printable);
 
     qmi_message_dms_read_user_data_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsWriteUserDataInput *
@@ -2113,7 +2113,7 @@ write_user_data_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2121,7 +2121,7 @@ write_user_data_ready (QmiClientDms *client,
         g_printerr ("error: couldn't write user data: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_write_user_data_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2129,7 +2129,7 @@ write_user_data_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_write_user_data_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -2145,7 +2145,7 @@ read_eri_file_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2153,7 +2153,7 @@ read_eri_file_ready (QmiClientDms *client,
         g_printerr ("error: couldn't read eri file: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_read_eri_file_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2173,7 +2173,7 @@ read_eri_file_ready (QmiClientDms *client,
     g_free (eri_file_printable);
 
     qmi_message_dms_read_eri_file_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsRestoreFactoryDefaultsInput *
@@ -2208,7 +2208,7 @@ restore_factory_defaults_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2216,7 +2216,7 @@ restore_factory_defaults_ready (QmiClientDms *client,
         g_printerr ("error: couldn't restores factory defaults: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_restore_factory_defaults_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2225,7 +2225,7 @@ restore_factory_defaults_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_restore_factory_defaults_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageDmsValidateServiceProgrammingCodeInput *
@@ -2260,7 +2260,7 @@ validate_service_programming_code_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2268,7 +2268,7 @@ validate_service_programming_code_ready (QmiClientDms *client,
         g_printerr ("error: couldn't validate Service Programming Code: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_validate_service_programming_code_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2276,7 +2276,7 @@ validate_service_programming_code_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_validate_service_programming_code_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -2293,7 +2293,7 @@ get_band_capabilities_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2301,7 +2301,7 @@ get_band_capabilities_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get band capabilities: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_band_capabilities_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2327,7 +2327,7 @@ get_band_capabilities_ready (QmiClientDms *client,
     }
 
     qmi_message_dms_get_band_capabilities_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -2342,7 +2342,7 @@ get_factory_sku_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2350,7 +2350,7 @@ get_factory_sku_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get factory SKU: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_factory_sku_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2365,7 +2365,7 @@ get_factory_sku_ready (QmiClientDms *client,
              VALIDATE_UNKNOWN (str));
 
     qmi_message_dms_get_factory_sku_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 typedef struct {
@@ -2507,7 +2507,7 @@ get_image_info (ListImagesContext *operation_ctx)
     if (operation_ctx->i >= array->len) {
         /* We're done */
         list_images_context_free (operation_ctx);
-        shutdown (TRUE);
+        operation_shutdown (TRUE);
         return;
     }
 
@@ -2565,7 +2565,7 @@ list_stored_images_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2573,7 +2573,7 @@ list_stored_images_ready (QmiClientDms *client,
         g_printerr ("error: couldn't list stored images: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_list_stored_images_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2644,7 +2644,7 @@ get_stored_image_list_stored_images_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2652,7 +2652,7 @@ get_stored_image_list_stored_images_ready (QmiClientDms *client,
         g_printerr ("error: couldn't list stored images: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_list_stored_images_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2687,7 +2687,7 @@ get_stored_image_list_stored_images_ready (QmiClientDms *client,
                         qmi_dms_firmware_image_type_get_string (image->type),
                         image_index);
             qmi_message_dms_list_stored_images_output_unref (output);
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
@@ -2740,27 +2740,27 @@ get_stored_image (QmiClientDms *client,
 
         if (i >= 3) {
             g_printerr ("A maximum of 2 images should be given: '%s'\n", str);
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
         if (!qmicli_read_firmware_id_from_string (split[i], &type, &image_index)) {
             g_printerr ("Couldn't parse input string as firmware index info: '%s'\n", str);
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
         if (type == QMI_DMS_FIRMWARE_IMAGE_TYPE_MODEM) {
             if (modem_index >= 0) {
                 g_printerr ("Couldn't two 'modem' type firwmare indexes: '%s'\n", str);
-                shutdown (FALSE);
+                operation_shutdown (FALSE);
                 return;
             }
             modem_index = (gint)image_index;
         } else if (type == QMI_DMS_FIRMWARE_IMAGE_TYPE_PRI) {
             if (pri_index >= 0) {
                 g_printerr ("Couldn't two 'pri' type firwmare indexes: '%s'\n", str);
-                shutdown (FALSE);
+                operation_shutdown (FALSE);
                 return;
             }
             pri_index = (gint)image_index;
@@ -2798,7 +2798,7 @@ select_stored_image_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2806,7 +2806,7 @@ select_stored_image_ready (QmiClientDms *client,
         g_printerr ("error: couldn't select stored image: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_set_firmware_preference_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2824,7 +2824,7 @@ select_stored_image_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_set_firmware_preference_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -2849,7 +2849,7 @@ get_stored_image_select_ready (QmiClientDms *client,
     if (!modem_image_id.unique_id || !modem_image_id.build_id ||
         !pri_image_id.unique_id || !pri_image_id.build_id) {
         g_printerr ("error: must specify a pair of 'modem' and 'pri' images to select\n");
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2888,7 +2888,7 @@ delete_stored_image_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2896,14 +2896,14 @@ delete_stored_image_ready (QmiClientDms *client,
         g_printerr ("error: couldn't delete stored image: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_delete_stored_image_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
     g_print ("[%s] Stored image successfully deleted\n",
              qmi_device_get_path_display (ctx->device));
     qmi_message_dms_delete_stored_image_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -2927,7 +2927,7 @@ get_stored_image_delete_ready (QmiClientDms *client,
     if (modem_image_id.unique_id && modem_image_id.build_id &&
         pri_image_id.unique_id && pri_image_id.build_id) {
         g_printerr ("error: cannot specify multiple images to delete\n");
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2938,7 +2938,7 @@ get_stored_image_delete_ready (QmiClientDms *client,
         qmi_message_dms_delete_stored_image_input_set_image (input, &pri_image_id, NULL);
     else {
         g_printerr ("error: didn't specify correctly an image to delete\n");
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2970,7 +2970,7 @@ set_fcc_authentication_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2978,7 +2978,7 @@ set_fcc_authentication_ready (QmiClientDms *client,
         g_printerr ("error: couldn't set FCC authentication: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_set_fcc_authentication_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2986,7 +2986,7 @@ set_fcc_authentication_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_set_fcc_authentication_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -3002,7 +3002,7 @@ get_supported_messages_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -3010,7 +3010,7 @@ get_supported_messages_ready (QmiClientDms *client,
         g_printerr ("error: couldn't get supported DMS messages: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_get_supported_messages_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -3024,7 +3024,7 @@ get_supported_messages_ready (QmiClientDms *client,
     g_free (str);
 
     qmi_message_dms_get_supported_messages_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -3038,7 +3038,7 @@ reset_ready (QmiClientDms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -3046,7 +3046,7 @@ reset_ready (QmiClientDms *client,
         g_printerr ("error: couldn't reset the DMS service: %s\n", error->message);
         g_error_free (error);
         qmi_message_dms_reset_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -3054,13 +3054,13 @@ reset_ready (QmiClientDms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_dms_reset_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static gboolean
 noop_cb (gpointer unused)
 {
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
     return FALSE;
 }
 
@@ -3167,7 +3167,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously setting PIN protection...");
         input = uim_set_pin_protection_input_create (uim_set_pin_protection_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_uim_set_pin_protection (ctx->client,
@@ -3187,7 +3187,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously verifying PIN...");
         input = uim_verify_pin_input_create (uim_verify_pin_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_uim_verify_pin (ctx->client,
@@ -3207,7 +3207,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously unblocking PIN...");
         input = uim_unblock_pin_input_create (uim_unblock_pin_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_uim_unblock_pin (ctx->client,
@@ -3227,7 +3227,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously changing PIN...");
         input = uim_change_pin_input_create (uim_change_pin_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_uim_change_pin (ctx->client,
@@ -3319,7 +3319,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously setting operating mode...");
         input = set_operating_mode_input_create (set_operating_mode_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_set_operating_mode (ctx->client,
@@ -3375,7 +3375,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously requesting automatic activation...");
         input = activate_automatic_input_create (activate_automatic_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_activate_automatic (ctx->client,
@@ -3395,7 +3395,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously requesting manual activation...");
         input = activate_manual_input_create (activate_manual_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_activate_manual (ctx->client,
@@ -3427,7 +3427,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously setting user lock state...");
         input = set_user_lock_state_input_create (set_user_lock_state_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_set_user_lock_state (ctx->client,
@@ -3447,7 +3447,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously changing user lock code...");
         input = set_user_lock_code_input_create (set_user_lock_code_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_set_user_lock_code (ctx->client,
@@ -3479,7 +3479,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously writing user data...");
         input = write_user_data_input_create (write_user_data_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_write_user_data (ctx->client,
@@ -3511,7 +3511,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously restoring factory defaults...");
         input = restore_factory_defaults_input_create (restore_factory_defaults_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_restore_factory_defaults (ctx->client,
@@ -3531,7 +3531,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously validating SPC...");
         input = validate_service_programming_code_input_create (validate_service_programming_code_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_validate_service_programming_code (ctx->client,
@@ -3551,7 +3551,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously getting CK status...");
         input = uim_get_ck_status_input_create (uim_get_ck_status_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_uim_get_ck_status (ctx->client,
@@ -3571,7 +3571,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously setting CK protection...");
         input = uim_set_ck_protection_input_create (uim_set_ck_protection_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_uim_set_ck_protection (ctx->client,
@@ -3591,7 +3591,7 @@ qmicli_dms_run (QmiDevice *device,
         g_debug ("Asynchronously unblocking CK...");
         input = uim_unblock_ck_input_create (uim_unblock_ck_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
         qmi_client_dms_uim_unblock_ck (ctx->client,
diff --git a/src/qmicli/qmicli-nas.c b/src/qmicli/qmicli-nas.c
index 16aa89f..aaafb71 100644
--- a/src/qmicli/qmicli-nas.c
+++ b/src/qmicli/qmicli-nas.c
@@ -181,7 +181,7 @@ context_free (Context *context)
 }
 
 static void
-shutdown (gboolean operation_status)
+operation_shutdown (gboolean operation_status)
 {
     /* Cleanup context and finish async operation */
     context_free (ctx);
@@ -226,7 +226,7 @@ get_signal_info_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -234,7 +234,7 @@ get_signal_info_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get signal info: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_signal_info_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -320,7 +320,7 @@ get_signal_info_ready (QmiClientNas *client,
     }
 
     qmi_message_nas_get_signal_info_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageNasGetSignalStrengthInput *
@@ -372,7 +372,7 @@ get_signal_strength_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -380,7 +380,7 @@ get_signal_strength_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get signal strength: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_signal_strength_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -479,7 +479,7 @@ get_signal_strength_ready (QmiClientNas *client,
     /* Just skip others for now */
 
     qmi_message_nas_get_signal_strength_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -504,7 +504,7 @@ get_tx_rx_info_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -512,7 +512,7 @@ get_tx_rx_info_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get TX/RX info: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_tx_rx_info_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -607,7 +607,7 @@ get_tx_rx_info_ready (QmiClientNas *client,
     }
 
     qmi_message_nas_get_tx_rx_info_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageNasGetTxRxInfoInput *
@@ -648,7 +648,7 @@ get_home_network_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -656,7 +656,7 @@ get_home_network_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get home network: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_home_network_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -723,7 +723,7 @@ get_home_network_ready (QmiClientNas *client,
     }
 
     qmi_message_nas_get_home_network_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -737,7 +737,7 @@ get_serving_system_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -745,7 +745,7 @@ get_serving_system_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get serving system: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_serving_system_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1153,7 +1153,7 @@ get_serving_system_ready (QmiClientNas *client,
     }
 
     qmi_message_nas_get_serving_system_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1167,7 +1167,7 @@ get_system_info_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1175,7 +1175,7 @@ get_system_info_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get system info: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_system_info_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1839,7 +1839,7 @@ get_system_info_ready (QmiClientNas *client,
     }
 
     qmi_message_nas_get_system_info_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1856,7 +1856,7 @@ get_technology_preference_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1864,7 +1864,7 @@ get_technology_preference_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get technology preference: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_technology_preference_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1893,7 +1893,7 @@ get_technology_preference_ready (QmiClientNas *client,
     }
 
     qmi_message_nas_get_technology_preference_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -1920,7 +1920,7 @@ get_system_selection_preference_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -1928,7 +1928,7 @@ get_system_selection_preference_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get system_selection preference: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_system_selection_preference_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2044,7 +2044,7 @@ get_system_selection_preference_ready (QmiClientNas *client,
     }
 
     qmi_message_nas_get_system_selection_preference_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageNasSetSystemSelectionPreferenceInput *
@@ -2111,7 +2111,7 @@ set_system_selection_preference_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2119,7 +2119,7 @@ set_system_selection_preference_ready (QmiClientNas *client,
         g_printerr ("error: couldn't set operating mode: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_set_system_selection_preference_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2127,7 +2127,7 @@ set_system_selection_preference_ready (QmiClientNas *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_nas_set_system_selection_preference_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -2142,7 +2142,7 @@ network_scan_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2150,7 +2150,7 @@ network_scan_ready (QmiClientNas *client,
         g_printerr ("error: couldn't scan networks: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_network_scan_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2220,7 +2220,7 @@ network_scan_ready (QmiClientNas *client,
     }
 
     qmi_message_nas_network_scan_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static gchar *
@@ -2286,7 +2286,7 @@ get_cell_location_info_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2294,7 +2294,7 @@ get_cell_location_info_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get cell location info: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_cell_location_info_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2753,7 +2753,7 @@ get_cell_location_info_ready (QmiClientNas *client,
     }
 
     qmi_message_nas_get_cell_location_info_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -2769,7 +2769,7 @@ get_supported_messages_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2777,7 +2777,7 @@ get_supported_messages_ready (QmiClientNas *client,
         g_printerr ("error: couldn't get supported NAS messages: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_get_supported_messages_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2791,7 +2791,7 @@ get_supported_messages_ready (QmiClientNas *client,
     g_free (str);
 
     qmi_message_nas_get_supported_messages_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -2805,7 +2805,7 @@ reset_ready (QmiClientNas *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2813,7 +2813,7 @@ reset_ready (QmiClientNas *client,
         g_printerr ("error: couldn't reset the NAS service: %s\n", error->message);
         g_error_free (error);
         qmi_message_nas_reset_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -2821,13 +2821,13 @@ reset_ready (QmiClientNas *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_nas_reset_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static gboolean
 noop_cb (gpointer unused)
 {
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
     return FALSE;
 }
 
@@ -2880,7 +2880,7 @@ qmicli_nas_run (QmiDevice *device,
         input = get_tx_rx_info_input_create (get_tx_rx_info_str,
                                              &interface);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
@@ -2962,7 +2962,7 @@ qmicli_nas_run (QmiDevice *device,
 
         input = set_system_selection_preference_input_create (set_system_selection_preference_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
diff --git a/src/qmicli/qmicli-pbm.c b/src/qmicli/qmicli-pbm.c
index c04c442..4df8dd8 100644
--- a/src/qmicli/qmicli-pbm.c
+++ b/src/qmicli/qmicli-pbm.c
@@ -106,7 +106,7 @@ context_free (Context *context)
 }
 
 static void
-shutdown (gboolean operation_status)
+operation_shutdown (gboolean operation_status)
 {
     /* Cleanup context and finish async operation */
     context_free (ctx);
@@ -134,7 +134,7 @@ get_all_capabilities_ready (QmiClientPbm *client,
         g_printerr ("error: operation failed: %s\n",
                     error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -142,7 +142,7 @@ get_all_capabilities_ready (QmiClientPbm *client,
         g_printerr ("error: couldn't get capabilities: %s\n", error->message);
         g_error_free (error);
         qmi_message_pbm_get_all_capabilities_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -293,13 +293,13 @@ get_all_capabilities_ready (QmiClientPbm *client,
     }
 
     qmi_message_pbm_get_all_capabilities_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static gboolean
 noop_cb (gpointer unused)
 {
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
     return FALSE;
 }
 
diff --git a/src/qmicli/qmicli-uim.c b/src/qmicli/qmicli-uim.c
index 7268a9e..5965333 100644
--- a/src/qmicli/qmicli-uim.c
+++ b/src/qmicli/qmicli-uim.c
@@ -131,7 +131,7 @@ context_free (Context *context)
 }
 
 static void
-shutdown (gboolean operation_status)
+operation_shutdown (gboolean operation_status)
 {
     /* Cleanup context and finish async operation */
     context_free (ctx);
@@ -151,7 +151,7 @@ get_supported_messages_ready (QmiClientUim *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -159,7 +159,7 @@ get_supported_messages_ready (QmiClientUim *client,
         g_printerr ("error: couldn't get supported UIM messages: %s\n", error->message);
         g_error_free (error);
         qmi_message_uim_get_supported_messages_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -173,7 +173,7 @@ get_supported_messages_ready (QmiClientUim *client,
     g_free (str);
 
     qmi_message_uim_get_supported_messages_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -187,7 +187,7 @@ reset_ready (QmiClientUim *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -195,7 +195,7 @@ reset_ready (QmiClientUim *client,
         g_printerr ("error: couldn't reset the UIM service: %s\n", error->message);
         g_error_free (error);
         qmi_message_uim_reset_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -203,13 +203,13 @@ reset_ready (QmiClientUim *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_uim_reset_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static gboolean
 noop_cb (gpointer unused)
 {
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
     return FALSE;
 }
 
@@ -230,7 +230,7 @@ get_card_status_ready (QmiClientUim *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -238,7 +238,7 @@ get_card_status_ready (QmiClientUim *client,
         g_printerr ("error: couldn't get card status: %s\n", error->message);
         g_error_free (error);
         qmi_message_uim_get_card_status_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -360,7 +360,7 @@ get_card_status_ready (QmiClientUim *client,
     }
 
     qmi_message_uim_get_card_status_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static gboolean
@@ -427,7 +427,7 @@ read_transparent_ready (QmiClientUim *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -448,7 +448,7 @@ read_transparent_ready (QmiClientUim *client,
         }
 
         qmi_message_uim_read_transparent_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -482,7 +482,7 @@ read_transparent_ready (QmiClientUim *client,
     }
 
     qmi_message_uim_read_transparent_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageUimReadTransparentInput *
@@ -541,7 +541,7 @@ get_file_attributes_ready (QmiClientUim *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         g_free (file_name);
         return;
     }
@@ -565,7 +565,7 @@ get_file_attributes_ready (QmiClientUim *client,
         }
 
         qmi_message_uim_get_file_attributes_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         g_free (file_name);
         return;
     }
@@ -651,7 +651,7 @@ get_file_attributes_ready (QmiClientUim *client,
     }
 
     qmi_message_uim_get_file_attributes_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageUimGetFileAttributesInput *
@@ -696,7 +696,7 @@ qmicli_uim_run (QmiDevice *device,
 
         input = read_transparent_build_input (read_transparent_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
@@ -718,7 +718,7 @@ qmicli_uim_run (QmiDevice *device,
 
         input = get_file_attributes_build_input (get_file_attributes_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
diff --git a/src/qmicli/qmicli-voice.c b/src/qmicli/qmicli-voice.c
index 95730e8..9e13405 100644
--- a/src/qmicli/qmicli-voice.c
+++ b/src/qmicli/qmicli-voice.c
@@ -113,7 +113,7 @@ context_free (Context *context)
 }
 
 static void
-shutdown (gboolean operation_status)
+operation_shutdown (gboolean operation_status)
 {
     /* Cleanup context and finish async operation */
     context_free (ctx);
@@ -146,7 +146,7 @@ get_config_ready (QmiClientVoice *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -154,7 +154,7 @@ get_config_ready (QmiClientVoice *client,
         g_printerr ("error: couldn't get Voice configuration: %s\n", error->message);
         g_error_free (error);
         qmi_message_voice_get_config_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -249,7 +249,7 @@ get_config_ready (QmiClientVoice *client,
                  qmi_voice_domain_get_string (current_voice_domain_preference));
 
     qmi_message_voice_get_config_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -265,7 +265,7 @@ get_supported_messages_ready (QmiClientVoice *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -273,7 +273,7 @@ get_supported_messages_ready (QmiClientVoice *client,
         g_printerr ("error: couldn't get supported VOICE messages: %s\n", error->message);
         g_error_free (error);
         qmi_message_voice_get_supported_messages_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -287,13 +287,13 @@ get_supported_messages_ready (QmiClientVoice *client,
     g_free (str);
 
     qmi_message_voice_get_supported_messages_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static gboolean
 noop_cb (gpointer unused)
 {
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
     return FALSE;
 }
 
diff --git a/src/qmicli/qmicli-wda.c b/src/qmicli/qmicli-wda.c
index 76793d6..504640f 100644
--- a/src/qmicli/qmicli-wda.c
+++ b/src/qmicli/qmicli-wda.c
@@ -119,7 +119,7 @@ context_free (Context *context)
 }
 
 static void
-shutdown (gboolean operation_status)
+operation_shutdown (gboolean operation_status)
 {
     /* Cleanup context and finish async operation */
     context_free (ctx);
@@ -129,7 +129,7 @@ shutdown (gboolean operation_status)
 static gboolean
 noop_cb (gpointer unused)
 {
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
     return FALSE;
 }
 
@@ -149,7 +149,7 @@ get_data_format_ready (QmiClientWda *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -157,7 +157,7 @@ get_data_format_ready (QmiClientWda *client,
         g_printerr ("error: couldn't get data format: %s\n", error->message);
         g_error_free (error);
         qmi_message_wda_get_data_format_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -210,7 +210,7 @@ get_data_format_ready (QmiClientWda *client,
         g_print ("Downlink data aggregation max size: '%u'\n", data_aggregation_max_size);
 
     qmi_message_wda_get_data_format_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -230,7 +230,7 @@ set_data_format_ready (QmiClientWda *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -238,7 +238,7 @@ set_data_format_ready (QmiClientWda *client,
         g_printerr ("error: couldn't set data format: %s\n", error->message);
         g_error_free (error);
         qmi_message_wda_set_data_format_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -291,7 +291,7 @@ set_data_format_ready (QmiClientWda *client,
         g_print ("     Downlink data aggregation max size: '%u'\n", data_aggregation_max_size);
 
     qmi_message_wda_set_data_format_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static QmiMessageWdaSetDataFormatInput *
@@ -332,7 +332,7 @@ get_supported_messages_ready (QmiClientWda *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -340,7 +340,7 @@ get_supported_messages_ready (QmiClientWda *client,
         g_printerr ("error: couldn't get supported WDA messages: %s\n", error->message);
         g_error_free (error);
         qmi_message_wda_get_supported_messages_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -354,7 +354,7 @@ get_supported_messages_ready (QmiClientWda *client,
     g_free (str);
 
     qmi_message_wda_get_supported_messages_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 void
@@ -374,7 +374,7 @@ qmicli_wda_run (QmiDevice *device,
 
         input = set_data_format_input_create (set_data_format_str);
         if (!input) {
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
diff --git a/src/qmicli/qmicli-wds.c b/src/qmicli/qmicli-wds.c
index 4705530..d872d21 100644
--- a/src/qmicli/qmicli-wds.c
+++ b/src/qmicli/qmicli-wds.c
@@ -179,7 +179,7 @@ context_free (Context *context)
 }
 
 static void
-shutdown (gboolean operation_status)
+operation_shutdown (gboolean operation_status)
 {
     /* Cleanup context and finish async operation */
     context_free (ctx);
@@ -198,7 +198,7 @@ stop_network_ready (QmiClientWds *client,
         g_printerr ("error: operation failed: %s\n",
                     error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -206,7 +206,7 @@ stop_network_ready (QmiClientWds *client,
         g_printerr ("error: couldn't stop network: %s\n", error->message);
         g_error_free (error);
         qmi_message_wds_stop_network_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -216,7 +216,7 @@ stop_network_ready (QmiClientWds *client,
     g_print ("[%s] Network stopped\n",
              qmi_device_get_path_display (ctx->device));
     qmi_message_wds_stop_network_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -319,7 +319,7 @@ start_network_ready (QmiClientWds *client,
         g_printerr ("error: operation failed: %s\n",
                     error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -354,7 +354,7 @@ start_network_ready (QmiClientWds *client,
 
         g_error_free (error);
         qmi_message_wds_start_network_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -383,7 +383,7 @@ start_network_ready (QmiClientWds *client,
     }
 
     /* Nothing else to do */
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -399,7 +399,7 @@ get_packet_service_status_ready (QmiClientWds *client,
         g_printerr ("error: operation failed: %s\n",
                     error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -407,7 +407,7 @@ get_packet_service_status_ready (QmiClientWds *client,
         g_printerr ("error: couldn't get packet service status: %s\n", error->message);
         g_error_free (error);
         qmi_message_wds_get_packet_service_status_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -421,7 +421,7 @@ get_packet_service_status_ready (QmiClientWds *client,
              qmi_wds_connection_status_get_string (status));
 
     qmi_message_wds_get_packet_service_status_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -438,7 +438,7 @@ get_packet_statistics_ready (QmiClientWds *client,
         g_printerr ("error: operation failed: %s\n",
                     error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -446,7 +446,7 @@ get_packet_statistics_ready (QmiClientWds *client,
         g_printerr ("error: couldn't get packet statistics: %s\n", error->message);
         g_error_free (error);
         qmi_message_wds_get_packet_statistics_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -488,7 +488,7 @@ get_packet_statistics_ready (QmiClientWds *client,
         g_print ("\tRX bytes OK (last): %" G_GUINT64_FORMAT "\n", val64);
 
     qmi_message_wds_get_packet_statistics_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -504,7 +504,7 @@ get_data_bearer_technology_ready (QmiClientWds *client,
         g_printerr ("error: operation failed: %s\n",
                     error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -527,7 +527,7 @@ get_data_bearer_technology_ready (QmiClientWds *client,
 
         g_error_free (error);
         qmi_message_wds_get_data_bearer_technology_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -539,7 +539,7 @@ get_data_bearer_technology_ready (QmiClientWds *client,
              qmi_device_get_path_display (ctx->device),
              qmi_wds_data_bearer_technology_get_string (current));
     qmi_message_wds_get_data_bearer_technology_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -589,7 +589,7 @@ get_current_data_bearer_technology_ready (QmiClientWds *client,
         g_printerr ("error: operation failed: %s\n",
                     error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -614,7 +614,7 @@ get_current_data_bearer_technology_ready (QmiClientWds *client,
 
         g_error_free (error);
         qmi_message_wds_get_current_data_bearer_technology_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -633,7 +633,7 @@ get_current_data_bearer_technology_ready (QmiClientWds *client,
     }
 
     qmi_message_wds_get_current_data_bearer_technology_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 typedef struct {
@@ -711,7 +711,7 @@ get_next_profile_settings (GetProfileListContext *inner_ctx)
         /* All done */
         g_array_unref (inner_ctx->profile_list);
         g_slice_free (GetProfileListContext, inner_ctx);
-        shutdown (TRUE);
+        operation_shutdown (TRUE);
         return;
     }
 
@@ -750,7 +750,7 @@ get_profile_list_ready (QmiClientWds *client,
         g_printerr ("error: operation failed: %s\n",
                     error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -773,7 +773,7 @@ get_profile_list_ready (QmiClientWds *client,
 
         g_error_free (error);
         qmi_message_wds_get_profile_list_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -782,7 +782,7 @@ get_profile_list_ready (QmiClientWds *client,
     if (!profile_list || !profile_list->len) {
         g_print ("Profile list empty\n");
         qmi_message_wds_get_profile_list_output_unref (output);
-        shutdown (TRUE);
+        operation_shutdown (TRUE);
         return;
     }
 
@@ -808,7 +808,7 @@ get_default_settings_ready (QmiClientWds *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -830,7 +830,7 @@ get_default_settings_ready (QmiClientWds *client,
         }
         g_error_free (error);
         qmi_message_wds_get_default_settings_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -853,7 +853,7 @@ get_default_settings_ready (QmiClientWds *client,
     }
 
     qmi_message_wds_get_default_settings_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -869,7 +869,7 @@ get_supported_messages_ready (QmiClientWds *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -877,7 +877,7 @@ get_supported_messages_ready (QmiClientWds *client,
         g_printerr ("error: couldn't get supported WDS messages: %s\n", error->message);
         g_error_free (error);
         qmi_message_wds_get_supported_messages_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -891,7 +891,7 @@ get_supported_messages_ready (QmiClientWds *client,
     g_free (str);
 
     qmi_message_wds_get_supported_messages_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -905,7 +905,7 @@ reset_ready (QmiClientWds *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -913,7 +913,7 @@ reset_ready (QmiClientWds *client,
         g_printerr ("error: couldn't reset the WDS service: %s\n", error->message);
         g_error_free (error);
         qmi_message_wds_reset_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -921,13 +921,13 @@ reset_ready (QmiClientWds *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_wds_reset_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static gboolean
 noop_cb (gpointer unused)
 {
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
     return FALSE;
 }
 
@@ -1007,7 +1007,7 @@ qmicli_wds_run (QmiDevice *device,
             packet_data_handle > G_MAXUINT32) {
             g_printerr ("error: invalid packet data handle given '%s'\n",
                         stop_network_str);
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
@@ -1094,7 +1094,7 @@ qmicli_wds_run (QmiDevice *device,
         else {
             g_printerr ("error: invalid profile type '%s'. Expected '3gpp' or '3gpp2'.'\n",
                         get_profile_list_str);
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
@@ -1121,7 +1121,7 @@ qmicli_wds_run (QmiDevice *device,
         else {
             g_printerr ("error: invalid default type '%s'. Expected '3gpp' or '3gpp2'.'\n",
                         get_default_settings_str);
-            shutdown (FALSE);
+            operation_shutdown (FALSE);
             return;
         }
 
diff --git a/src/qmicli/qmicli-wms.c b/src/qmicli/qmicli-wms.c
index 9cc7943..4599905 100644
--- a/src/qmicli/qmicli-wms.c
+++ b/src/qmicli/qmicli-wms.c
@@ -113,7 +113,7 @@ context_free (Context *context)
 }
 
 static void
-shutdown (gboolean operation_status)
+operation_shutdown (gboolean operation_status)
 {
     /* Cleanup context and finish async operation */
     context_free (ctx);
@@ -133,7 +133,7 @@ get_supported_messages_ready (QmiClientWms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -141,7 +141,7 @@ get_supported_messages_ready (QmiClientWms *client,
         g_printerr ("error: couldn't get supported WMS messages: %s\n", error->message);
         g_error_free (error);
         qmi_message_wms_get_supported_messages_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -155,7 +155,7 @@ get_supported_messages_ready (QmiClientWms *client,
     g_free (str);
 
     qmi_message_wms_get_supported_messages_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static void
@@ -169,7 +169,7 @@ reset_ready (QmiClientWms *client,
     if (!output) {
         g_printerr ("error: operation failed: %s\n", error->message);
         g_error_free (error);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -177,7 +177,7 @@ reset_ready (QmiClientWms *client,
         g_printerr ("error: couldn't reset the WMS service: %s\n", error->message);
         g_error_free (error);
         qmi_message_wms_reset_output_unref (output);
-        shutdown (FALSE);
+        operation_shutdown (FALSE);
         return;
     }
 
@@ -185,13 +185,13 @@ reset_ready (QmiClientWms *client,
              qmi_device_get_path_display (ctx->device));
 
     qmi_message_wms_reset_output_unref (output);
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
 }
 
 static gboolean
 noop_cb (gpointer unused)
 {
-    shutdown (TRUE);
+    operation_shutdown (TRUE);
     return FALSE;
 }