diff options
| -rw-r--r-- | clients/cli/connections.c | 4 | ||||
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 2 | ||||
| -rw-r--r-- | shared/nm-utils/nm-shared-utils.h | 6 | ||||
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 32e3f7f424..c509c6a928 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -5884,7 +5884,7 @@ _split_cmd (const char *cmd, char **out_arg0, const char **out_argr) if (!cmd) return; - while (NM_IN_SET (cmd[0], ' ', '\t')) + while (nm_utils_is_separator (cmd[0])) cmd++; if (!cmd[0]) return; @@ -5893,7 +5893,7 @@ _split_cmd (const char *cmd, char **out_arg0, const char **out_argr) arg0 = g_strndup (cmd, l); cmd += l; if (cmd[0]) { - while (NM_IN_SET (cmd[0], ' ', '\t')) + while (nm_utils_is_separator (cmd[0])) cmd++; if (cmd[0]) argr = cmd; diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index dcf0eed395..2c8a5159de 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -2157,7 +2157,7 @@ _get_fcn_802_1x_phase2_private_key (ARGS_GET_FCN) password = path + strcspn (path, " \t"); \ if (password[0] != '\0') { \ password[0] = '\0'; \ - while (NM_IN_SET (password[0], ' ', '\t')) \ + while (nm_utils_is_separator (password[0])) \ password++; \ } else \ password = password_free = g_strdup (pwd_func (NM_SETTING_802_1X (setting))); \ diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h index 5ee83eb877..ddb77a429b 100644 --- a/shared/nm-utils/nm-shared-utils.h +++ b/shared/nm-utils/nm-shared-utils.h @@ -191,6 +191,12 @@ void nm_utils_strbuf_append_str (char **buf, gsize *len, const char *str); const char *nm_strquote (char *buf, gsize buf_len, const char *str); +static inline gboolean +nm_utils_is_separator (const char c) +{ + return NM_IN_SET (c, ' ', '\t'); +} + /*****************************************************************************/ const char **nm_utils_strsplit_set (const char *str, const char *delimiters); 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 7fa473cb6e..11474c3da7 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -502,7 +502,7 @@ parse_route_line_is_comment (const char *line) * * initscripts compares: "$line" =~ '^[[:space:]]*(\#.*)?$' */ - while (NM_IN_SET (line[0], ' ', '\t')) + while (nm_utils_is_separator (line[0])) line++; if (NM_IN_SET (line[0], '\0', '#')) return TRUE; |