diff options
author | Thomas Haller <thaller@redhat.com> | 2020-02-21 12:56:03 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-02-21 18:24:25 +0100 |
commit | ffa098edae563e35ffbb50b20e306fbfa3d5617a (patch) | |
tree | 30b206dc06a9c7afb4ee70e61f3ce79e9f317fde | |
parent | 95891e78e77377707ecf6c868750c570f5ca7c3b (diff) | |
download | NetworkManager-ffa098edae563e35ffbb50b20e306fbfa3d5617a.tar.gz |
all: unify spelling of "fall-through" comment for switch statements
We used "/* fall through */" and "/* fall-through */" inconsistently.
Rename to use only one variant.
-rw-r--r-- | libnm-core/nm-utils.c | 2 | ||||
-rw-r--r-- | libnm/nm-vpn-service-plugin.c | 2 | ||||
-rw-r--r-- | src/devices/nm-device-ethernet.c | 4 | ||||
-rw-r--r-- | src/devices/nm-device.c | 6 | ||||
-rw-r--r-- | src/devices/wwan/nm-modem-broadband.c | 10 | ||||
-rw-r--r-- | src/dns/nm-dns-manager.c | 4 | ||||
-rw-r--r-- | src/nm-config.c | 2 | ||||
-rw-r--r-- | src/nm-manager.c | 2 | ||||
-rw-r--r-- | src/tests/test-core.c | 4 | ||||
-rw-r--r-- | src/vpn/nm-vpn-connection.c | 4 |
10 files changed, 20 insertions, 20 deletions
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 8e3de874a5..c6f057e60e 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -1178,7 +1178,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: if (!have_ap) { if (wifi_caps & (NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104)) diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 9ebcfd6461..a0df8402c5 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -200,7 +200,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); - /* fall through */ + /* 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); diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 3c478fa3ed..c9dd75d6af 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1241,7 +1241,7 @@ dcb_state (NMDevice *device, gboolean timeout) break; } _LOGD (LOGD_DCB, "dcb_state() preconfig down falling through"); - /* fall through */ + /* fall-through */ case DCB_WAIT_CARRIER_PRECONFIG_UP: if (timeout || carrier) { _LOGD (LOGD_DCB, "dcb_state() preconfig up configuring DCB"); @@ -1265,7 +1265,7 @@ dcb_state (NMDevice *device, gboolean timeout) break; } _LOGD (LOGD_DCB, "dcb_state() postconfig down falling through"); - /* fall through */ + /* fall-through */ case DCB_WAIT_CARRIER_POSTCONFIG_UP: if (timeout || carrier) { _LOGD (LOGD_DCB, "dcb_state() postconfig up starting IP"); diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index d9d9eea280..52054ac456 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -8097,7 +8097,7 @@ dhcp4_state_changed (NMDhcpClient *client, /* Ignore expiry before we even have a lease (NAK, old lease, etc) */ if (priv->ip_state_4 == NM_DEVICE_IP_STATE_CONF) break; - /* fall through */ + /* fall-through */ case NM_DHCP_STATE_DONE: case NM_DHCP_STATE_FAIL: case NM_DHCP_STATE_TERMINATED: @@ -8864,7 +8864,7 @@ dhcp6_state_changed (NMDhcpClient *client, */ if (priv->dhcp6.mode == NM_NDISC_DHCP_LEVEL_OTHERCONF) break; - /* fall through */ + /* fall-through */ case NM_DHCP_STATE_DONE: case NM_DHCP_STATE_FAIL: dhcp6_fail (self, state); @@ -13906,7 +13906,7 @@ device_ipx_changed (NMPlatform *platform, (gpointer) nmp_object_ref (NMP_OBJECT_UP_CAST (addr))); } - /* fall through */ + /* fall-through */ case NMP_OBJECT_TYPE_IP6_ROUTE: if (!priv->queued_ip_config_id_6) { priv->queued_ip_config_id_6 = g_idle_add (queued_ip6_config_change, self); diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index a1ae867128..947aa4c840 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -548,7 +548,7 @@ connect_context_step (NMModemBroadband *self) switch (ctx->step) { case CONNECT_STEP_FIRST: ctx->step++; - /* fall through */ + /* fall-through */ case CONNECT_STEP_WAIT_FOR_SIM: if (MODEM_CAPS_3GPP (ctx->caps) && !self->_priv.sim_iface) { @@ -556,7 +556,7 @@ connect_context_step (NMModemBroadband *self) break; } ctx->step++; - /* fall through */ + /* fall-through */ case CONNECT_STEP_UNLOCK: if ( MODEM_CAPS_3GPP (ctx->caps) @@ -577,7 +577,7 @@ connect_context_step (NMModemBroadband *self) break; } ctx->step++; - /* fall through */ + /* fall-through */ case CONNECT_STEP_WAIT_FOR_READY: { GError *error = NULL; @@ -605,7 +605,7 @@ connect_context_step (NMModemBroadband *self) ctx->step++; } - /* fall through */ + /* fall-through */ case CONNECT_STEP_CONNECT: if (!ctx->connect_properties) break; @@ -639,7 +639,7 @@ connect_context_step (NMModemBroadband *self) } ctx->step++; - /* fall through */ + /* fall-through */ case CONNECT_STEP_LAST: if (self->_priv.ipv4_config || self->_priv.ipv6_config) diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c index 6fc6c829fa..9f4b2e8a49 100644 --- a/src/dns/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c @@ -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_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: @@ -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_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: diff --git a/src/nm-config.c b/src/nm-config.c index 198f803fab..4b4ffd3122 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -1355,7 +1355,7 @@ _string_append_val (GString *str, const char *value) case '#': case ':': g_string_append_c (str, '+'); - /* fall through */ + /* fall-through */ default: g_string_append_c (str, *value); } diff --git a/src/nm-manager.c b/src/nm-manager.c index 75bee452de..e49c739a10 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -3335,7 +3335,7 @@ add: _LOGI (LOGD_PLATFORM, "(%s): '%s' plugin not available; creating generic device", plink->name, nm_link_type_to_string (plink->type)); nm_plugin_missing = TRUE; - /* fall through */ + /* fall-through */ default: device = nm_device_generic_new (plink, nm_plugin_missing); break; diff --git a/src/tests/test-core.c b/src/tests/test-core.c index f55f3dff05..590f7c36a5 100644 --- a/src/tests/test-core.c +++ b/src/tests/test-core.c @@ -1536,7 +1536,7 @@ test_nm_utils_strbuf_append (void) _strbuf_append_c (&t_buf, &t_len, str[0]); break; } - /* fall through */ + /* fall-through */ case 1: _strbuf_append_str (&t_buf, &t_len, str); break; @@ -1545,7 +1545,7 @@ test_nm_utils_strbuf_append (void) _strbuf_append (&t_buf, &t_len, "%c", str[0]); break; } - /* fall through */ + /* fall-through */ case 3: _strbuf_append (&t_buf, &t_len, "%s", str); break; diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index f3e4a6812e..3e208a8806 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -619,7 +619,7 @@ _set_vpn_state (NMVpnConnection *self, } vpn_cleanup (self, parent_dev); - /* fall through */ + /* fall-through */ default: priv->secrets_idx = SECRETS_REQ_SYSTEM; break; @@ -1580,7 +1580,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); - /* fall through */ + /* fall-through */ case 4: g_variant_get_child (v, 0, "u", &route.network); g_variant_get_child (v, 1, "u", &plen); |