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

broadband-modem-qmi: fix warnings with -Wimplicit-fallthrough

Browse Source 
In file included from mm-broadband-modem-qmi.c:29:
  mm-broadband-modem-qmi.c: In function ‘uim_get_card_status_output_parse’:
  mm-log.h:33:5: error: this statement may fall through [-Werror=implicit-fallthrough=]
     33 |     _mm_log (G_STRLOC, G_STRFUNC, MM_LOG_LEVEL_WARN, ## __VA_ARGS__ )
        |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  mm-broadband-modem-qmi.c:894:13: note: in expansion of macro ‘mm_warn’
    894 |             mm_warn ("PUK2 permanently blocked");
        |             ^~~~~~~
  mm-broadband-modem-qmi.c:895:9: note: here
    895 |         case QMI_UIM_PIN_STATE_BLOCKED:
        |         ^~~~
  ...
This commit is contained in:
Aleksander Morgado
2020-01-11 13:08:22 +01:00
parent 581d829eb7
commit d068d0493e
1 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mm-broadband-modem-qmi.c
View File

@@ -892,6 +892,7 @@ uim_get_card_status_output_parse (QmiMessageUimGetCardStatusOutput *output,
case QMI_UIM_PIN_STATE_PERMANENTLY_BLOCKED: case QMI_UIM_PIN_STATE_PERMANENTLY_BLOCKED:
mm_warn ("PUK2 permanently blocked"); mm_warn ("PUK2 permanently blocked");
/* Fall through */
case QMI_UIM_PIN_STATE_BLOCKED: case QMI_UIM_PIN_STATE_BLOCKED:
lock = MM_MODEM_LOCK_SIM_PUK2; lock = MM_MODEM_LOCK_SIM_PUK2;
break; break;
@@ -1063,7 +1064,7 @@ load_unlock_required_context_step (GTask *task)
switch (ctx->step) { switch (ctx->step) {
case LOAD_UNLOCK_REQUIRED_STEP_FIRST: case LOAD_UNLOCK_REQUIRED_STEP_FIRST:
ctx->step++; ctx->step++;
/* Go on to next step */ /* Fall through */
case LOAD_UNLOCK_REQUIRED_STEP_CDMA: case LOAD_UNLOCK_REQUIRED_STEP_CDMA:
/* CDMA-only modems don't need this */ /* CDMA-only modems don't need this */
@@ -1074,7 +1075,7 @@ load_unlock_required_context_step (GTask *task)
return; return;
} }
ctx->step++; ctx->step++;
/* Go on to next step */ /* Fall through */
case LOAD_UNLOCK_REQUIRED_STEP_DMS: case LOAD_UNLOCK_REQUIRED_STEP_DMS:
if (!self->priv->dms_uim_deprecated) { if (!self->priv->dms_uim_deprecated) {
@@ -1099,7 +1100,7 @@ load_unlock_required_context_step (GTask *task)
return; return;
} }
ctx->step++; ctx->step++;
/* Go on to next step */ /* Fall through */
case LOAD_UNLOCK_REQUIRED_STEP_UIM: case LOAD_UNLOCK_REQUIRED_STEP_UIM:
/* Failure to get UIM client at this point is hard as well */ /* Failure to get UIM client at this point is hard as well */
@@ -4209,7 +4210,7 @@ cdma_activation_context_step (GTask *task)
switch (ctx->step) { switch (ctx->step) {
case CDMA_ACTIVATION_STEP_FIRST: case CDMA_ACTIVATION_STEP_FIRST:
ctx->step++; ctx->step++;
/* Fall down to next step */ /* Fall through */
case CDMA_ACTIVATION_STEP_ENABLE_INDICATIONS: case CDMA_ACTIVATION_STEP_ENABLE_INDICATIONS:
/* Indications needed in automatic activation */ /* Indications needed in automatic activation */
@@ -4235,7 +4236,7 @@ cdma_activation_context_step (GTask *task)
g_assert (ctx->input_manual != NULL); g_assert (ctx->input_manual != NULL);
mm_info ("Activation step [1/5]: indications not needed in manual activation"); mm_info ("Activation step [1/5]: indications not needed in manual activation");
ctx->step++; ctx->step++;
/* Fall down to next step */ /* Fall through */
case CDMA_ACTIVATION_STEP_REQUEST_ACTIVATION: case CDMA_ACTIVATION_STEP_REQUEST_ACTIVATION:
/* Automatic activation */ /* Automatic activation */
@@ -5709,7 +5710,8 @@ load_initial_sms_parts_step (GTask *task)
switch (ctx->step) { switch (ctx->step) {
case LOAD_INITIAL_SMS_PARTS_STEP_FIRST: case LOAD_INITIAL_SMS_PARTS_STEP_FIRST:
ctx->step++; ctx->step++;
/* Fall down */ /* Fall through */
case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_FIRST: case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_FIRST:
/* If modem doesn't have 3GPP caps, skip 3GPP SMS */ /* If modem doesn't have 3GPP caps, skip 3GPP SMS */
if (!mm_iface_modem_is_3gpp (MM_IFACE_MODEM (self))) { if (!mm_iface_modem_is_3gpp (MM_IFACE_MODEM (self))) {
@@ -5718,39 +5720,46 @@ load_initial_sms_parts_step (GTask *task)
return; return;
} }
ctx->step++; ctx->step++;
/* Fall down */ /* Fall through */
case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_ALL: case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_ALL:
mm_dbg ("loading all 3GPP messages from storage '%s'...", mm_dbg ("loading all 3GPP messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA; mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_MT_READ: case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_MT_READ:
mm_dbg ("loading 3GPP MT-read messages from storage '%s'...", mm_dbg ("loading 3GPP MT-read messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MT_READ; tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MT_READ;
mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA; mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_MT_NOT_READ: case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_MT_NOT_READ:
mm_dbg ("loading 3GPP MT-not-read messages from storage '%s'...", mm_dbg ("loading 3GPP MT-not-read messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MT_NOT_READ; tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MT_NOT_READ;
mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA; mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_MO_SENT: case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_MO_SENT:
mm_dbg ("loading 3GPP MO-sent messages from storage '%s'...", mm_dbg ("loading 3GPP MO-sent messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MO_SENT; tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MO_SENT;
mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA; mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_MO_NOT_SENT: case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LIST_MO_NOT_SENT:
mm_dbg ("loading 3GPP MO-not-sent messages from storage '%s'...", mm_dbg ("loading 3GPP MO-not-sent messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MO_NOT_SENT; tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MO_NOT_SENT;
mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA; mode = QMI_WMS_MESSAGE_MODE_GSM_WCDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LAST: case LOAD_INITIAL_SMS_PARTS_STEP_3GPP_LAST:
ctx->step++; ctx->step++;
/* Fall down */ /* Fall through */
case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_FIRST: case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_FIRST:
/* If modem doesn't have CDMA caps, skip CDMA SMS */ /* If modem doesn't have CDMA caps, skip CDMA SMS */
if (!mm_iface_modem_is_cdma (MM_IFACE_MODEM (self))) { if (!mm_iface_modem_is_cdma (MM_IFACE_MODEM (self))) {
@@ -5759,39 +5768,46 @@ load_initial_sms_parts_step (GTask *task)
return; return;
} }
ctx->step++; ctx->step++;
/* Fall down */ /* Fall through */
case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_ALL: case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_ALL:
mm_dbg ("loading all CDMA messages from storage '%s'...", mm_dbg ("loading all CDMA messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
mode = QMI_WMS_MESSAGE_MODE_CDMA; mode = QMI_WMS_MESSAGE_MODE_CDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_MT_READ: case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_MT_READ:
mm_dbg ("loading CDMA MT-read messages from storage '%s'...", mm_dbg ("loading CDMA MT-read messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MT_READ; tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MT_READ;
mode = QMI_WMS_MESSAGE_MODE_CDMA; mode = QMI_WMS_MESSAGE_MODE_CDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_MT_NOT_READ: case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_MT_NOT_READ:
mm_dbg ("loading CDMA MT-not-read messages from storage '%s'...", mm_dbg ("loading CDMA MT-not-read messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MT_NOT_READ; tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MT_NOT_READ;
mode = QMI_WMS_MESSAGE_MODE_CDMA; mode = QMI_WMS_MESSAGE_MODE_CDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_MO_SENT: case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_MO_SENT:
mm_dbg ("loading CDMA MO-sent messages from storage '%s'...", mm_dbg ("loading CDMA MO-sent messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MO_SENT; tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MO_SENT;
mode = QMI_WMS_MESSAGE_MODE_CDMA; mode = QMI_WMS_MESSAGE_MODE_CDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_MO_NOT_SENT: case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LIST_MO_NOT_SENT:
mm_dbg ("loading CDMA MO-not-sent messages from storage '%s'...", mm_dbg ("loading CDMA MO-not-sent messages from storage '%s'...",
mm_sms_storage_get_string (ctx->storage)); mm_sms_storage_get_string (ctx->storage));
tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MO_NOT_SENT; tag_type = QMI_WMS_MESSAGE_TAG_TYPE_MO_NOT_SENT;
mode = QMI_WMS_MESSAGE_MODE_CDMA; mode = QMI_WMS_MESSAGE_MODE_CDMA;
break; break;
case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LAST: case LOAD_INITIAL_SMS_PARTS_STEP_CDMA_LAST:
ctx->step++; ctx->step++;
/* Fall down */ /* Fall through */
case LOAD_INITIAL_SMS_PARTS_STEP_LAST: case LOAD_INITIAL_SMS_PARTS_STEP_LAST:
/* All steps done */ /* All steps done */
g_task_return_boolean (task, TRUE); g_task_return_boolean (task, TRUE);
@@ -8232,7 +8248,7 @@ signal_load_values_context_step (GTask *task)
switch (ctx->step) { switch (ctx->step) {
case SIGNAL_LOAD_VALUES_STEP_SIGNAL_FIRST: case SIGNAL_LOAD_VALUES_STEP_SIGNAL_FIRST:
ctx->step++; ctx->step++;
/* Fall down */ /* Fall through */
case SIGNAL_LOAD_VALUES_STEP_SIGNAL_INFO: case SIGNAL_LOAD_VALUES_STEP_SIGNAL_INFO:
if (qmi_client_check_version (QMI_CLIENT (ctx->client), 1, 8)) { if (qmi_client_check_version (QMI_CLIENT (ctx->client), 1, 8)) {
@@ -8245,7 +8261,7 @@ signal_load_values_context_step (GTask *task)
return; return;
} }
ctx->step++; ctx->step++;
/* Fall down */ /* Fall through */
case SIGNAL_LOAD_VALUES_STEP_SIGNAL_STRENGTH: case SIGNAL_LOAD_VALUES_STEP_SIGNAL_STRENGTH:
/* If already loaded with signal info, don't try signal strength */ /* If already loaded with signal info, don't try signal strength */
@@ -8273,7 +8289,7 @@ signal_load_values_context_step (GTask *task)
return; return;
} }
ctx->step++; ctx->step++;
/* Fall down */ /* Fall through */
case SIGNAL_LOAD_VALUES_STEP_SIGNAL_LAST: case SIGNAL_LOAD_VALUES_STEP_SIGNAL_LAST:
/* If any result is set, succeed */ /* If any result is set, succeed */