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

all: unify spelling of "fall-through" comment for switch statements

Browse Source 
We used "/* fall through */" and "/* fall-through */" inconsistently.
Rename to use only one variant.
This commit is contained in:
Thomas Haller
2020-02-21 12:56:03 +01:00
parent 95891e78e7
commit ffa098edae
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm-core/nm-utils.c
View File

@@ -1178,7 +1178,7 @@ nm_utils_security_valid (NMUtilsSecurityType type,
case NMU_SEC_LEAP: /* require PRIVACY bit for LEAP? */ case NMU_SEC_LEAP: /* require PRIVACY bit for LEAP? */
if (adhoc) if (adhoc)
return FALSE; return FALSE;
/* fall through */ /* fall-through */
case NMU_SEC_STATIC_WEP: case NMU_SEC_STATIC_WEP:
if (!have_ap) { if (!have_ap) {
if (wifi_caps & (NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104)) if (wifi_caps & (NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104))

2
libnm/nm-vpn-service-plugin.c
View File

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

4
src/devices/nm-device-ethernet.c
View File

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

6
src/devices/nm-device.c
View File

@@ -8097,7 +8097,7 @@ dhcp4_state_changed (NMDhcpClient *client,
/* Ignore expiry before we even have a lease (NAK, old lease, etc) */ /* Ignore expiry before we even have a lease (NAK, old lease, etc) */
if (priv->ip_state_4 == NM_DEVICE_IP_STATE_CONF) if (priv->ip_state_4 == NM_DEVICE_IP_STATE_CONF)
break; break;
/* fall through */ /* fall-through */
case NM_DHCP_STATE_DONE: case NM_DHCP_STATE_DONE:
case NM_DHCP_STATE_FAIL: case NM_DHCP_STATE_FAIL:
case NM_DHCP_STATE_TERMINATED: case NM_DHCP_STATE_TERMINATED:
@@ -8864,7 +8864,7 @@ dhcp6_state_changed (NMDhcpClient *client,
*/ */
if (priv->dhcp6.mode == NM_NDISC_DHCP_LEVEL_OTHERCONF) if (priv->dhcp6.mode == NM_NDISC_DHCP_LEVEL_OTHERCONF)
break; break;
/* fall through */ /* fall-through */
case NM_DHCP_STATE_DONE: case NM_DHCP_STATE_DONE:
case NM_DHCP_STATE_FAIL: case NM_DHCP_STATE_FAIL:
dhcp6_fail (self, state); dhcp6_fail (self, state);
@@ -13906,7 +13906,7 @@ device_ipx_changed (NMPlatform *platform,
(gpointer) nmp_object_ref (NMP_OBJECT_UP_CAST (addr))); (gpointer) nmp_object_ref (NMP_OBJECT_UP_CAST (addr)));
} }
/* fall through */ /* fall-through */
case NMP_OBJECT_TYPE_IP6_ROUTE: case NMP_OBJECT_TYPE_IP6_ROUTE:
if (!priv->queued_ip_config_id_6) { if (!priv->queued_ip_config_id_6) {
priv->queued_ip_config_id_6 = g_idle_add (queued_ip6_config_change, self); priv->queued_ip_config_id_6 = g_idle_add (queued_ip6_config_change, self);

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

@@ -548,7 +548,7 @@ connect_context_step (NMModemBroadband *self)
switch (ctx->step) { switch (ctx->step) {
case CONNECT_STEP_FIRST: case CONNECT_STEP_FIRST:
ctx->step++; ctx->step++;
/* fall through */ /* fall-through */
case CONNECT_STEP_WAIT_FOR_SIM: case CONNECT_STEP_WAIT_FOR_SIM:
if (MODEM_CAPS_3GPP (ctx->caps) && !self->_priv.sim_iface) { if (MODEM_CAPS_3GPP (ctx->caps) && !self->_priv.sim_iface) {
@@ -556,7 +556,7 @@ connect_context_step (NMModemBroadband *self)
break; break;
} }
ctx->step++; ctx->step++;
/* fall through */ /* fall-through */
case CONNECT_STEP_UNLOCK: case CONNECT_STEP_UNLOCK:
if ( MODEM_CAPS_3GPP (ctx->caps) if ( MODEM_CAPS_3GPP (ctx->caps)
@@ -577,7 +577,7 @@ connect_context_step (NMModemBroadband *self)
break; break;
} }
ctx->step++; ctx->step++;
/* fall through */ /* fall-through */
case CONNECT_STEP_WAIT_FOR_READY: { case CONNECT_STEP_WAIT_FOR_READY: {
GError *error = NULL; GError *error = NULL;
@@ -605,7 +605,7 @@ connect_context_step (NMModemBroadband *self)
ctx->step++; ctx->step++;
} }
/* fall through */ /* fall-through */
case CONNECT_STEP_CONNECT: case CONNECT_STEP_CONNECT:
if (!ctx->connect_properties) if (!ctx->connect_properties)
break; break;
@@ -639,7 +639,7 @@ connect_context_step (NMModemBroadband *self)
} }
ctx->step++; ctx->step++;
/* fall through */ /* fall-through */
case CONNECT_STEP_LAST: case CONNECT_STEP_LAST:
if (self->_priv.ipv4_config || self->_priv.ipv6_config) if (self->_priv.ipv4_config || self->_priv.ipv6_config)

4
src/dns/nm-dns-manager.c
View File

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

2
src/nm-config.c
View File

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

2
src/nm-manager.c
View File

@@ -3335,7 +3335,7 @@ add:
_LOGI (LOGD_PLATFORM, "(%s): '%s' plugin not available; creating generic device", _LOGI (LOGD_PLATFORM, "(%s): '%s' plugin not available; creating generic device",
plink->name, nm_link_type_to_string (plink->type)); plink->name, nm_link_type_to_string (plink->type));
nm_plugin_missing = TRUE; nm_plugin_missing = TRUE;
/* fall through */ /* fall-through */
default: default:
device = nm_device_generic_new (plink, nm_plugin_missing); device = nm_device_generic_new (plink, nm_plugin_missing);
break; break;

4
src/tests/test-core.c
View File

@@ -1536,7 +1536,7 @@ test_nm_utils_strbuf_append (void)
_strbuf_append_c (&t_buf, &t_len, str[0]); _strbuf_append_c (&t_buf, &t_len, str[0]);
break; break;
} }
/* fall through */ /* fall-through */
case 1: case 1:
_strbuf_append_str (&t_buf, &t_len, str); _strbuf_append_str (&t_buf, &t_len, str);
break; break;
@@ -1545,7 +1545,7 @@ test_nm_utils_strbuf_append (void)
_strbuf_append (&t_buf, &t_len, "%c", str[0]); _strbuf_append (&t_buf, &t_len, "%c", str[0]);
break; break;
} }
/* fall through */ /* fall-through */
case 3: case 3:
_strbuf_append (&t_buf, &t_len, "%s", str); _strbuf_append (&t_buf, &t_len, "%s", str);
break; break;

4
src/vpn/nm-vpn-connection.c
View File

@@ -619,7 +619,7 @@ _set_vpn_state (NMVpnConnection *self,
} }
vpn_cleanup (self, parent_dev); vpn_cleanup (self, parent_dev);
/* fall through */ /* fall-through */
default: default:
priv->secrets_idx = SECRETS_REQ_SYSTEM; priv->secrets_idx = SECRETS_REQ_SYSTEM;
break; break;
@@ -1580,7 +1580,7 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict)
switch (g_variant_n_children (v)) { switch (g_variant_n_children (v)) {
case 5: case 5:
g_variant_get_child (v, 4, "u", &route.pref_src); g_variant_get_child (v, 4, "u", &route.pref_src);
/* fall through */ /* fall-through */
case 4: case 4:
g_variant_get_child (v, 0, "u", &route.network); g_variant_get_child (v, 0, "u", &route.network);
g_variant_get_child (v, 1, "u", &plen); g_variant_get_child (v, 1, "u", &plen);