fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-21 02:50:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all/style: remove duplicate semicolon (";;") in sources

Browse source
This commit is contained in:
Thomas Haller 2020-09-23 12:43:47 +02:00
parent 20ce16cc7b
commit dc3a477884
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
13 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnm-core/nm-keyfile/nm-keyfile.c
View file

@ -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;
}

4
libnm-core/nm-setting-ip-config.c
View file

@ -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;

2
libnm-core/nm-team-utils.c
View file

@ -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".

2
libnm/nm-remote-connection.c
View file

@ -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);
}

2
shared/nm-glib-aux/nm-keyfile-aux.c
View file

@ -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);

2
shared/nm-glib-aux/nm-shared-utils.c
View file

@ -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;

2
shared/nm-glib-aux/nm-value-type.h
View file

@ -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;

2
src/devices/nm-device-wireguard.c
View file

@ -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);
}

2
src/devices/wifi/nm-device-wifi-p2p.c
View file

@ -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;

2
src/ndisc/nm-lndp-ndisc.c
View file

@ -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;

2
src/nm-connectivity.c
View file

@ -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

2
src/settings/nm-settings.c
View file

@ -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) {

6
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -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);
}