diff options
author | Thomas Haller <thaller@redhat.com> | 2020-09-23 12:43:47 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-09-23 12:43:47 +0200 |
commit | dc3a477884bda6bbc9501b03eaf4c58c1b464d91 (patch) | |
tree | b395d78df6411893f7cc252210c6ddf7f2c42269 | |
parent | 20ce16cc7b6ef840e650b9c5138a03f49adb6e6f (diff) | |
download | NetworkManager-dc3a477884bda6bbc9501b03eaf4c58c1b464d91.tar.gz |
all/style: remove duplicate semicolon (";;") in sources
-rw-r--r-- | libnm-core/nm-keyfile/nm-keyfile.c | 4 | ||||
-rw-r--r-- | libnm-core/nm-setting-ip-config.c | 4 | ||||
-rw-r--r-- | libnm-core/nm-team-utils.c | 2 | ||||
-rw-r--r-- | libnm/nm-remote-connection.c | 2 | ||||
-rw-r--r-- | shared/nm-glib-aux/nm-keyfile-aux.c | 2 | ||||
-rw-r--r-- | shared/nm-glib-aux/nm-shared-utils.c | 2 | ||||
-rw-r--r-- | shared/nm-glib-aux/nm-value-type.h | 2 | ||||
-rw-r--r-- | src/devices/nm-device-wireguard.c | 2 | ||||
-rw-r--r-- | src/devices/wifi/nm-device-wifi-p2p.c | 2 | ||||
-rw-r--r-- | src/ndisc/nm-lndp-ndisc.c | 2 | ||||
-rw-r--r-- | src/nm-connectivity.c | 2 | ||||
-rw-r--r-- | src/settings/nm-settings.c | 2 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 6 |
13 files changed, 17 insertions, 17 deletions
diff --git a/libnm-core/nm-keyfile/nm-keyfile.c b/libnm-core/nm-keyfile/nm-keyfile.c index a51d75ab6e..d3d6892104 100644 --- a/libnm-core/nm-keyfile/nm-keyfile.c +++ b/libnm-core/nm-keyfile/nm-keyfile.c @@ -1235,7 +1235,7 @@ unescape_semicolons (char *str) for (i = 0, j = 0; str[i]; ) { if (str[i] == '\\' && str[i+1] == ';') i++; - str[j++] = str[i++];; + str[j++] = str[i++]; } nm_explicit_bzero (&str[j], i - j); return j; @@ -3848,7 +3848,7 @@ nm_keyfile_read (GKeyFile *keyfile, if (vpn_secrets) { info.group = NM_KEYFILE_GROUP_VPN_SECRETS; _read_setting_vpn_secrets (&info); - info.group = NULL;; + info.group = NULL; if (info.error) goto out_with_info_error; } diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index 8fac0d79a5..d402adf6ed 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -2985,7 +2985,7 @@ nm_ip_routing_rule_to_dbus (const NMIPRoutingRule *self) if (self->suppress_prefixlength != -1) _rr_to_dbus_add (&builder, RR_DBUS_ATTR_SUPPRESS_PREFIXLENGTH, g_variant_new_int32 (self->suppress_prefixlength)); - return g_variant_builder_end (&builder);; + return g_variant_builder_end (&builder); } /*****************************************************************************/ @@ -3264,7 +3264,7 @@ nm_ip_routing_rule_from_string (const char *str, continue; if (i64_suppress_prefixlength != -1) goto next_fail_word0_duplicate_key; - i64_suppress_prefixlength = _nm_utils_ascii_str_to_int64 (word1, 0, 0, G_MAXINT32, -1);; + i64_suppress_prefixlength = _nm_utils_ascii_str_to_int64 (word1, 0, 0, G_MAXINT32, -1); if (i64_suppress_prefixlength == -1) goto next_fail_word1_invalid_value; goto next_words_consumed; diff --git a/libnm-core/nm-team-utils.c b/libnm-core/nm-team-utils.c index ca18c7d6a0..8690d508ae 100644 --- a/libnm-core/nm-team-utils.c +++ b/libnm-core/nm-team-utils.c @@ -1626,7 +1626,7 @@ nm_team_setting_config_get (const NMTeamSetting *self) if (!list_is_empty) g_string_append (gstr, " }"); - js_str = g_string_free (gstr, list_is_empty);; + js_str = g_string_free (gstr, list_is_empty); } /* mutate the constant object. In C++ speak, these fields are "mutable". diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index b37f58148b..d35be010bf 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -688,7 +688,7 @@ is_ready (NMObject *nmobj) NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (nmobj); if (!priv->is_initialized) - return FALSE;; + return FALSE; return NM_OBJECT_CLASS (nm_remote_connection_parent_class)->is_ready (nmobj); } diff --git a/shared/nm-glib-aux/nm-keyfile-aux.c b/shared/nm-glib-aux/nm-keyfile-aux.c index 8b2af7a855..6504ac8e06 100644 --- a/shared/nm-glib-aux/nm-keyfile-aux.c +++ b/shared/nm-glib-aux/nm-keyfile-aux.c @@ -333,7 +333,7 @@ nm_key_file_db_set_string_list (NMKeyFileDB *self, gssize len) { gs_free char *old_value = NULL; - gboolean got_dirty = FALSE;; + gboolean got_dirty = FALSE; g_return_if_fail (_IS_KEY_FILE_DB (self, TRUE, FALSE)); g_return_if_fail (key); diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c index 3f1a618125..5901e87b7a 100644 --- a/shared/nm-glib-aux/nm-shared-utils.c +++ b/shared/nm-glib-aux/nm-shared-utils.c @@ -3734,7 +3734,7 @@ _nm_utils_strv_dup_packed (const char *const*strv, len2++; for (; i < len2; i++) result[i] = NULL; - g_return_val_if_reached (result);; + g_return_val_if_reached (result); } result[i] = sbuf; diff --git a/shared/nm-glib-aux/nm-value-type.h b/shared/nm-glib-aux/nm-value-type.h index 6fe6f07255..2f0c1df051 100644 --- a/shared/nm-glib-aux/nm-value-type.h +++ b/shared/nm-glib-aux/nm-value-type.h @@ -150,7 +150,7 @@ nm_value_type_to_variant (NMValueType value_type, switch (value_type) { case NM_VALUE_TYPE_BOOL: return g_variant_new_boolean (*((const bool *) src)); - case NM_VALUE_TYPE_INT32: return g_variant_new_int32 (*((const gint32 *) src));; + case NM_VALUE_TYPE_INT32: return g_variant_new_int32 (*((const gint32 *) src)); case NM_VALUE_TYPE_STRING: v_string = *((const char *const*) src); return v_string ? g_variant_new_string (v_string) : NULL; diff --git a/src/devices/nm-device-wireguard.c b/src/devices/nm-device-wireguard.c index d6c6cb78e0..cb8557cffe 100644 --- a/src/devices/nm-device-wireguard.c +++ b/src/devices/nm-device-wireguard.c @@ -1126,7 +1126,7 @@ skip: } } *out_peers = g_steal_pointer (&plpeers); - *out_peer_flags = g_steal_pointer (&plpeer_flags);; + *out_peer_flags = g_steal_pointer (&plpeer_flags); *out_len = i_good; *out_allowed_ips_data = g_steal_pointer (&allowed_ips); } diff --git a/src/devices/wifi/nm-device-wifi-p2p.c b/src/devices/wifi/nm-device-wifi-p2p.c index 497bc43603..9b63b63084 100644 --- a/src/devices/wifi/nm-device-wifi-p2p.c +++ b/src/devices/wifi/nm-device-wifi-p2p.c @@ -707,7 +707,7 @@ out: static void check_group_iface_ready (NMDeviceWifiP2P *self) { - NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (self);; + NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (self); if (!priv->group_iface) return; diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c index 654d9693ae..b4c52c6dc8 100644 --- a/src/ndisc/nm-lndp-ndisc.c +++ b/src/ndisc/nm-lndp-ndisc.c @@ -329,7 +329,7 @@ _ndp_msg_add_option (struct ndp_msg *msg, int len) typedef struct { struct nd_opt_hdr header; uint16_t reserved; - uint32_t lifetime;; + uint32_t lifetime; struct in6_addr addrs[0]; } NMLndpRdnssOption; diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index 2d80fd9021..cc7b524c8a 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -571,7 +571,7 @@ easy_write_cb (void *buffer, size_t size, size_t nmemb, void *userdata) return len; } - response = _con_config_get_response (cb_data->concheck.con_config);; + response = _con_config_get_response (cb_data->concheck.con_config); if (response[0] == '\0') { /* no response expected. We are however graceful and accept any diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 8d1f237a75..af0e425082 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -1255,7 +1255,7 @@ _connection_changed_process_one (NMSettings *self, _sett_conn_entry_sds_update (self, sett_conn_entry); - sd_best = c_list_first_entry (&sett_conn_entry->sd_lst_head, StorageData, sd_lst);; + sd_best = c_list_first_entry (&sett_conn_entry->sd_lst_head, StorageData, sd_lst); if ( !sd_best || !sd_best->connection) { diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index ad09edfb41..b11aebf878 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -1066,7 +1066,7 @@ parse_line_type_route_scope: 0, 0, G_MAXUINT8, - 0);; + 0); if (errno) { g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "Argument for \"%s\" is not a valid number", w); @@ -1084,7 +1084,7 @@ parse_line_type_uint8: p_info->int_base_16 ? 16 : 10, 0, G_MAXUINT8, - 0);; + 0); if (errno) { g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "Argument for \"%s\" is not a valid number", w); @@ -1106,7 +1106,7 @@ parse_line_type_uint32_with_lock: p_data->v.uint32_with_lock.lock = TRUE; } else p_data->v.uint32_with_lock.lock = FALSE; - p_data->v.uint32_with_lock.uint32 = _nm_utils_ascii_str_to_int64 (s, 10, 0, G_MAXUINT32, 0);; + p_data->v.uint32_with_lock.uint32 = _nm_utils_ascii_str_to_int64 (s, 10, 0, G_MAXUINT32, 0); } else { p_data->v.uint32 = _nm_utils_ascii_str_to_int64 (s, 10, 0, G_MAXUINT32, 0); } |