fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: fix coding style

Browse source
This commit is contained in:
Beniamino Galvani 2017-03-23 15:39:24 +01:00
parent 3ebe71cf06
commit e832461c0e
3 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -328,7 +328,7 @@ _numbered_tag (char *buf, gsize buf_len, const char *tag_name, int which)
static gboolean static gboolean
is_any_ip4_address_defined (shvarFile *ifcfg, int *idx) is_any_ip4_address_defined (shvarFile *ifcfg, int *idx)
{ {
int i, ignore, *ret_idx;; int i, ignore, *ret_idx;
ret_idx = idx ? idx : &ignore; ret_idx = idx ? idx : &ignore;
@ -453,9 +453,9 @@ parse_route_options (NMIPRoute *route, int family, const char *line, GError **er
GRegex *regex = NULL; GRegex *regex = NULL;
GMatchInfo *match_info = NULL; GMatchInfo *match_info = NULL;
gboolean success = FALSE; gboolean success = FALSE;
char *metrics[] = { NM_IP_ROUTE_ATTRIBUTE_WINDOW, NM_IP_ROUTE_ATTRIBUTE_CWND, static const char *metrics[] = { NM_IP_ROUTE_ATTRIBUTE_WINDOW, NM_IP_ROUTE_ATTRIBUTE_CWND,
NM_IP_ROUTE_ATTRIBUTE_INITCWND , NM_IP_ROUTE_ATTRIBUTE_INITRWND, NM_IP_ROUTE_ATTRIBUTE_INITCWND, NM_IP_ROUTE_ATTRIBUTE_INITRWND,
NM_IP_ROUTE_ATTRIBUTE_MTU , NULL }; NM_IP_ROUTE_ATTRIBUTE_MTU, NULL };
char buffer[1024]; char buffer[1024];
int i; int i;
@ -2089,7 +2089,7 @@ read_dcb_percent_array (shvarFile *ifcfg,
return FALSE; return FALSE;
} }
return TRUE;; return TRUE;
} }
static gboolean static gboolean
@ -2696,7 +2696,7 @@ eap_tls_reader (const char *eap_method,
const char *cli_cert_pw_flags_prop = phase2 ? NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS : NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS; const char *cli_cert_pw_flags_prop = phase2 ? NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS : NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS;
const char *pk_key = phase2 ? "IEEE_8021X_INNER_PRIVATE_KEY" : "IEEE_8021X_PRIVATE_KEY"; const char *pk_key = phase2 ? "IEEE_8021X_INNER_PRIVATE_KEY" : "IEEE_8021X_PRIVATE_KEY";
const char *pk_pw_key = phase2 ? "IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD": "IEEE_8021X_PRIVATE_KEY_PASSWORD"; const char *pk_pw_key = phase2 ? "IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD": "IEEE_8021X_PRIVATE_KEY_PASSWORD";
const char *pk_pw_flags_key = phase2 ? "IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS": "IEEE_8021X_PRIVATE_KEY_PASSWORD_FLAGS"; const char *pk_pw_flags_key = phase2 ? "IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS" : "IEEE_8021X_PRIVATE_KEY_PASSWORD_FLAGS";
const char *pk_pw_flags_prop = phase2 ? NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS : NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS; const char *pk_pw_flags_prop = phase2 ? NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS : NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS;
NMSettingSecretFlags flags; NMSettingSecretFlags flags;
NMSetting8021xCKScheme scheme; NMSetting8021xCKScheme scheme;
@ -3033,7 +3033,7 @@ eap_fast_reader (const char *eap_method,
char *fast_provisioning = NULL; char *fast_provisioning = NULL;
char *lower; char *lower;
char **list = NULL, **iter; char **list = NULL, **iter;
const char* pac_prov_str; const char *pac_prov_str;
gboolean allow_unauth = FALSE, allow_auth = FALSE; gboolean allow_unauth = FALSE, allow_auth = FALSE;
gboolean success = FALSE; gboolean success = FALSE;
@ -3125,12 +3125,12 @@ done:
typedef struct { typedef struct {
const char *method; const char *method;
gboolean (*reader)(const char *eap_method, gboolean (*reader) (const char *eap_method,
shvarFile *ifcfg, shvarFile *ifcfg,
shvarFile *keys, shvarFile *keys,
NMSetting8021x *s_8021x, NMSetting8021x *s_8021x,
gboolean phase2, gboolean phase2,
GError **error); GError **error);
gboolean wifi_phase2_only; gboolean wifi_phase2_only;
} EAPReader; } EAPReader;
@ -3232,7 +3232,7 @@ fill_8021x (shvarFile *ifcfg,
found = TRUE; found = TRUE;
break; break;
next: next:
eap++; eap++;
} }
@ -4417,7 +4417,7 @@ make_bond_setting (shvarFile *ifcfg,
if (keys && *keys) { if (keys && *keys) {
key = *keys; key = *keys;
val = *(keys + 1); val = *(keys + 1);
if (val && strlen(key) && strlen(val)) if (val && key[0] && val[0])
handle_bond_option (s_bond, key, val); handle_bond_option (s_bond, key, val);
} }
@ -4593,23 +4593,23 @@ handle_bridge_option (NMSetting *setting,
guint32 u = 0; guint32 u = 0;
if (!strcmp (key, "priority")) { if (!strcmp (key, "priority")) {
if (stp == FALSE) { if (stp == FALSE)
PARSE_WARNING ("'priority' invalid when STP is disabled"); PARSE_WARNING ("'priority' invalid when STP is disabled");
} else if (get_uint (value, &u)) else if (get_uint (value, &u))
g_object_set (setting, NM_SETTING_BRIDGE_PRIORITY, u, NULL); g_object_set (setting, NM_SETTING_BRIDGE_PRIORITY, u, NULL);
else else
PARSE_WARNING ("invalid priority value '%s'", value); PARSE_WARNING ("invalid priority value '%s'", value);
} else if (!strcmp (key, "hello_time")) { } else if (!strcmp (key, "hello_time")) {
if (stp == FALSE) { if (stp == FALSE)
PARSE_WARNING ("'hello_time' invalid when STP is disabled"); PARSE_WARNING ("'hello_time' invalid when STP is disabled");
} else if (get_uint (value, &u)) else if (get_uint (value, &u))
g_object_set (setting, NM_SETTING_BRIDGE_HELLO_TIME, u, NULL); g_object_set (setting, NM_SETTING_BRIDGE_HELLO_TIME, u, NULL);
else else
PARSE_WARNING ("invalid hello_time value '%s'", value); PARSE_WARNING ("invalid hello_time value '%s'", value);
} else if (!strcmp (key, "max_age")) { } else if (!strcmp (key, "max_age")) {
if (stp == FALSE) { if (stp == FALSE)
PARSE_WARNING ("'max_age' invalid when STP is disabled"); PARSE_WARNING ("'max_age' invalid when STP is disabled");
} else if (get_uint (value, &u)) else if (get_uint (value, &u))
g_object_set (setting, NM_SETTING_BRIDGE_MAX_AGE, u, NULL); g_object_set (setting, NM_SETTING_BRIDGE_MAX_AGE, u, NULL);
else else
PARSE_WARNING ("invalid max_age value '%s'", value); PARSE_WARNING ("invalid max_age value '%s'", value);
@ -4645,7 +4645,7 @@ handle_bridging_opts (NMSetting *setting,
if (keys && *keys) { if (keys && *keys) {
key = *keys; key = *keys;
val = *(keys + 1); val = *(keys + 1);
if (val && strlen(key) && strlen(val)) if (val && strlen (key) && strlen (val))
func (setting, stp, key, val); func (setting, stp, key, val);
} }

5
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
View file

@ -45,8 +45,9 @@ check_rpm_temp_suffix (const char *path)
/* Matches *;[a-fA-F0-9]{8}; used by rpm */ /* Matches *;[a-fA-F0-9]{8}; used by rpm */
ptr = strrchr (path, ';'); ptr = strrchr (path, ';');
if (ptr && (strspn (ptr + 1, "abcdefABCDEF0123456789") == 8) if ( ptr
&& (! ptr[9])) && strspn (ptr + 1, "abcdefABCDEF0123456789") == 8
&& !ptr[9])
return TRUE; return TRUE;
return FALSE; return FALSE;
} }

20
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -1029,11 +1029,11 @@ write_wired_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
int len = g_strv_length ((char **)s390_subchannels); int len = g_strv_length ((char **)s390_subchannels);
tmp = NULL; tmp = NULL;
if (len == 2) { if (len == 2) {
tmp = g_strdup_printf ("%s,%s", s390_subchannels[0], s390_subchannels[1]); tmp = g_strdup_printf ("%s,%s", s390_subchannels[0], s390_subchannels[1]);
} else if (len == 3) { } else if (len == 3) {
tmp = g_strdup_printf ("%s,%s,%s", s390_subchannels[0], s390_subchannels[1], tmp = g_strdup_printf ("%s,%s,%s", s390_subchannels[0], s390_subchannels[1],
s390_subchannels[2]); s390_subchannels[2]);
} }
svSetValueStr (ifcfg, "SUBCHANNELS", tmp); svSetValueStr (ifcfg, "SUBCHANNELS", tmp);
g_free (tmp); g_free (tmp);
@ -1781,7 +1781,7 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg)
g_string_free (str, TRUE); g_string_free (str, TRUE);
} }
svSetValueStr (ifcfg, "ZONE", nm_setting_connection_get_zone(s_con)); svSetValueStr (ifcfg, "ZONE", nm_setting_connection_get_zone (s_con));
svSetValueStr (ifcfg, "MASTER_UUID", NULL); svSetValueStr (ifcfg, "MASTER_UUID", NULL);
svSetValueStr (ifcfg, "MASTER", NULL); svSetValueStr (ifcfg, "MASTER", NULL);
@ -1944,7 +1944,7 @@ write_route_file_legacy (const char *filename, NMSettingIPConfig *s_ip4, GError
return TRUE; return TRUE;
} }
route_items = g_malloc0 (sizeof (char*) * (num + 1)); route_items = g_malloc0 (sizeof (char *) * (num + 1));
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
gs_free char *options = NULL; gs_free char *options = NULL;
@ -2345,7 +2345,7 @@ write_ip4_aliases (NMConnection *connection, char *base_ifcfg_path)
{ {
NMSettingIPConfig *s_ip4; NMSettingIPConfig *s_ip4;
gs_free char *base_ifcfg_dir = NULL, *base_ifcfg_name = NULL; gs_free char *base_ifcfg_dir = NULL, *base_ifcfg_name = NULL;
const char*base_name; const char *base_name;
int i, num, base_ifcfg_name_len, base_name_len; int i, num, base_ifcfg_name_len, base_name_len;
GDir *dir; GDir *dir;
@ -2620,7 +2620,7 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
/* handle IPV6_DEFROUTE */ /* handle IPV6_DEFROUTE */
/* IPV6_DEFROUTE has the opposite meaning from 'never-default' */ /* IPV6_DEFROUTE has the opposite meaning from 'never-default' */
if (nm_setting_ip_config_get_never_default(s_ip6)) if (nm_setting_ip_config_get_never_default (s_ip6))
svSetValueStr (ifcfg, "IPV6_DEFROUTE", "no"); svSetValueStr (ifcfg, "IPV6_DEFROUTE", "no");
else else
svSetValueStr (ifcfg, "IPV6_DEFROUTE", "yes"); svSetValueStr (ifcfg, "IPV6_DEFROUTE", "yes");
@ -2642,7 +2642,7 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
/* IPv6 Privacy Extensions */ /* IPv6 Privacy Extensions */
svUnsetValue (ifcfg, "IPV6_PRIVACY"); svUnsetValue (ifcfg, "IPV6_PRIVACY");
svUnsetValue (ifcfg, "IPV6_PRIVACY_PREFER_PUBLIC_IP"); svUnsetValue (ifcfg, "IPV6_PRIVACY_PREFER_PUBLIC_IP");
switch (nm_setting_ip6_config_get_ip6_privacy (NM_SETTING_IP6_CONFIG (s_ip6))){ switch (nm_setting_ip6_config_get_ip6_privacy (NM_SETTING_IP6_CONFIG (s_ip6))) {
case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED:
svSetValueStr (ifcfg, "IPV6_PRIVACY", "no"); svSetValueStr (ifcfg, "IPV6_PRIVACY", "no");
break; break;