all: cleanup switch fall-through comments for -Wimplicit-fallthrough warning

The -Wimplicit-fallthrough=3 warning is quite flexible of accepting
a fall-through warning.

Some comments were missing or not detected correctly.

Thereby, also change all other comments to follow the exact
same pattern.

(cherry picked from commit 7c6c8f0d8b)
This commit is contained in:
Thomas Haller 2017-02-06 14:42:47 +01:00
parent 55852df7c8
commit 4603ce7ad0
11 changed files with 19 additions and 23 deletions

View file

@ -1070,7 +1070,7 @@ nm_utils_security_valid (NMUtilsSecurityType type,
case NMU_SEC_LEAP: /* require PRIVACY bit for LEAP? */
if (adhoc)
return FALSE;
/* Fall through */
/* fall through */
case NMU_SEC_STATIC_WEP:
g_assert (have_ap);
if (!(ap_flags & NM_802_11_AP_FLAGS_PRIVACY))

View file

@ -697,7 +697,7 @@ nm_utils_security_valid (NMUtilsSecurityType type,
case NMU_SEC_LEAP: /* require PRIVACY bit for LEAP? */
if (adhoc)
return FALSE;
/* Fall through */
/* fall through */
case NMU_SEC_STATIC_WEP:
g_assert (have_ap);
if (!(ap_flags & NM_802_11_AP_FLAGS_PRIVACY))

View file

@ -217,7 +217,7 @@ nm_vpn_service_plugin_disconnect (NMVpnServicePlugin *plugin, GError **err)
break;
case NM_VPN_SERVICE_STATE_STARTING:
_emit_failure (plugin, NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED);
/* fallthru */
/* fall through */
case NM_VPN_SERVICE_STATE_STARTED:
nm_vpn_service_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_STOPPING);
ret = NM_VPN_SERVICE_PLUGIN_GET_CLASS (plugin)->disconnect (plugin, err);

View file

@ -1171,7 +1171,7 @@ dcb_state (NMDevice *device, gboolean timeout)
break;
}
_LOGD (LOGD_DCB, "dcb_state() preconfig down falling through");
/* carrier never went down? fall through */
/* fall through */
case DCB_WAIT_CARRIER_PRECONFIG_UP:
if (timeout || carrier) {
_LOGD (LOGD_DCB, "dcb_state() preconfig up configuring DCB");
@ -1195,7 +1195,7 @@ dcb_state (NMDevice *device, gboolean timeout)
break;
}
_LOGD (LOGD_DCB, "dcb_state() postconfig down falling through");
/* carrier never went down? fall through */
/* fall through */
case DCB_WAIT_CARRIER_POSTCONFIG_UP:
if (timeout || carrier) {
_LOGD (LOGD_DCB, "dcb_state() postconfig up starting IP");

View file

@ -5340,7 +5340,7 @@ dhcp4_state_changed (NMDhcpClient *client,
/* Ignore expiry before we even have a lease (NAK, old lease, etc) */
if (priv->ip4_state == IP_CONF)
break;
/* Fall through */
/* fall through */
case NM_DHCP_STATE_DONE:
case NM_DHCP_STATE_FAIL:
dhcp4_fail (self, FALSE);
@ -6159,7 +6159,7 @@ dhcp6_state_changed (NMDhcpClient *client,
*/
if (priv->dhcp6.mode == NM_NDISC_DHCP_LEVEL_OTHERCONF)
break;
/* Otherwise, fall through */
/* fall through */
case NM_DHCP_STATE_FAIL:
dhcp6_fail (self, FALSE);
break;
@ -10336,7 +10336,7 @@ device_ipx_changed (NMPlatform *platform,
priv->dad6_failed_addrs = g_slist_append (priv->dad6_failed_addrs,
g_memdup (addr, sizeof (NMPlatformIP6Address)));
}
/* fallthrough */
/* fall through */
case NMP_OBJECT_TYPE_IP6_ROUTE:
if (nm_device_get_unmanaged_flags (self, NM_UNMANAGED_PLATFORM_INIT)) {
priv->queued_ip6_config_pending = TRUE;

View file

@ -489,7 +489,6 @@ connect_context_step (NMModemBroadband *self)
}
ctx->step++;
/* fall through */
case CONNECT_STEP_WAIT_FOR_READY: {
GError *error = NULL;
@ -527,9 +526,8 @@ connect_context_step (NMModemBroadband *self)
}
ctx->step++;
/* fall through */
}
/* fall through */
case CONNECT_STEP_CONNECT:
if (ctx->ip_types_i < ctx->ip_types->len) {
NMModemIPType current;

View file

@ -1127,8 +1127,7 @@ deactivate_step (DeactivateContext *ctx)
switch (ctx->step) {
case DEACTIVATE_CONTEXT_STEP_FIRST:
ctx->step++;
/* Fall down */
/* fall through */
case DEACTIVATE_CONTEXT_STEP_CLEANUP:
/* Make sure we keep a ref to the PPP manager if there is one */
if (priv->ppp_manager)
@ -1136,8 +1135,7 @@ deactivate_step (DeactivateContext *ctx)
/* Run cleanup */
NM_MODEM_GET_CLASS (ctx->self)->deactivate_cleanup (ctx->self, ctx->device);
ctx->step++;
/* Fall down */
/* fall through */
case DEACTIVATE_CONTEXT_STEP_PPP_MANAGER_STOP:
/* If we have a PPP manager, stop it */
if (ctx->ppp_manager) {
@ -1148,8 +1146,7 @@ deactivate_step (DeactivateContext *ctx)
return;
}
ctx->step++;
/* Fall down */
/* fall through */
case DEACTIVATE_CONTEXT_STEP_MM_DISCONNECT:
/* Disconnect asynchronously */
NM_MODEM_GET_CLASS (ctx->self)->disconnect (ctx->self,

View file

@ -1566,7 +1566,7 @@ _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager)
case NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN:
case NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE:
nm_assert_not_reached ();
/* fall-through */
/* fall through */
case NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED:
return NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED;
default:
@ -1586,7 +1586,7 @@ _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager)
case NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED:
case NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE:
nm_assert_not_reached ();
/* fall-through */
/* fall through */
case NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE:
case NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF:
case NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG:

View file

@ -1046,6 +1046,7 @@ _string_append_val (GString *str, const char *value)
case '#':
case ':':
g_string_append_c (str, '+');
/* fall through */
default:
g_string_append_c (str, *value);
}

View file

@ -1291,7 +1291,7 @@ test_nm_utils_strbuf_append (void)
nm_utils_strbuf_append_c (&t_buf, &t_len, str[0]);
break;
}
/* fall-through */
/* fall through */
case 1:
nm_utils_strbuf_append_str (&t_buf, &t_len, str);
break;
@ -1300,7 +1300,7 @@ test_nm_utils_strbuf_append (void)
nm_utils_strbuf_append (&t_buf, &t_len, "%c", str[0]);
break;
}
/* fall-through */
/* fall through */
case 3:
nm_utils_strbuf_append (&t_buf, &t_len, "%s", str);
break;

View file

@ -637,7 +637,7 @@ _set_vpn_state (NMVpnConnection *self,
/* Tear down and clean up the connection */
call_plugin_disconnect (self);
vpn_cleanup (self, parent_dev);
/* Fall through */
/* fall through */
default:
priv->secrets_idx = SECRETS_REQ_SYSTEM;
break;
@ -1514,7 +1514,7 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
switch (g_variant_n_children (v)) {
case 5:
g_variant_get_child (v, 4, "u", &route.pref_src);
/* fallthrough */
/* fall through */
case 4:
g_variant_get_child (v, 0, "u", &route.network);
g_variant_get_child (v, 1, "u", &plen);