summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-04-12 12:51:17 +0200
committerThomas Haller <thaller@redhat.com>2019-04-17 11:11:21 +0200
commitced7dbe8bfb19fbccd2bbad8ea8bf44ef66d442e (patch)
tree5e6ef1e11f42ecff26bacd5f6fe96959d02ce593
parentd59f046bb62dc9b655a1c3f585ea8b06128fe07a (diff)
downloadNetworkManager-ced7dbe8bfb19fbccd2bbad8ea8bf44ef66d442e.tar.gz
shared: remove unused nm_utils_str_simpletokens_extract_next()
This can be replaced by nm_utils_escaped_tokens_split(). Note that nm_utils_escaped_tokens_split() does not behave exactly the same. For example, nm_utils_str_simpletokens_extract_next() would remove all backslashes and leave only the following character. nm_utils_escaped_tokens_split() instead only strips backslashes that preceed a delimiter, whitespace or another backslash. But we should have one preferred way of tokenizing, and I find this preferable, because it allows for most backslashes to appear verbatim.
-rw-r--r--shared/nm-utils/nm-shared-utils.c53
-rw-r--r--shared/nm-utils/nm-shared-utils.h2
2 files changed, 0 insertions, 55 deletions
diff --git a/shared/nm-utils/nm-shared-utils.c b/shared/nm-utils/nm-shared-utils.c
index 51d33b4911..06cd481ebb 100644
--- a/shared/nm-utils/nm-shared-utils.c
+++ b/shared/nm-utils/nm-shared-utils.c
@@ -2691,59 +2691,6 @@ _nm_utils_unescape_plain (char *str, const char *candidates, gboolean do_strip)
return str;
}
-char *
-nm_utils_str_simpletokens_extract_next (char **p_line_start)
-{
- char *s_next;
- char *s_start;
- gsize j;
-
- s_start = *p_line_start;
- if (!s_start)
- return NULL;
-
- s_start = nm_str_skip_leading_spaces (s_start);
-
- if (s_start[0] == '\0') {
- *p_line_start = s_start;
- return NULL;
- }
-
- s_next = s_start;
- j = 0;
- while (TRUE) {
- if (s_next[0] == '\0') {
- s_start[j] = '\0';
- *p_line_start = s_next;
- return s_start;
- }
- if (s_next[0] == '\\') {
- s_next++;
- if (s_next[0] == '\0') {
- /* trailing backslash at end of word. That's an error,
- * but we silently drop the backslash and signal success. */
- *p_line_start = s_next;
- if (j == 0)
- return NULL;
- s_start[j] = '\0';
- return s_start;
- }
-
- s_start[j++] = (s_next++)[0];
- continue;
- }
- if (!g_ascii_isspace (s_next[0])) {
- s_start[j++] = (s_next++)[0];
- continue;
- }
-
- nm_assert (j > 0);
- s_start[j] = '\0';
- *p_line_start = nm_str_skip_leading_spaces (&s_next[1]);
- return s_start;
- }
-}
-
/*****************************************************************************/
typedef struct {
diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h
index aeb1e2a1c6..4591cc8e9a 100644
--- a/shared/nm-utils/nm-shared-utils.h
+++ b/shared/nm-utils/nm-shared-utils.h
@@ -398,8 +398,6 @@ nm_utils_strsplit_set (const char *str,
return nm_utils_strsplit_set_full (str, delimiters, NM_UTILS_STRSPLIT_SET_FLAGS_NONE);
}
-char *nm_utils_str_simpletokens_extract_next (char **p_line_start);
-
gssize nm_utils_strv_find_first (char **list, gssize len, const char *needle);
char **_nm_utils_strv_cleanup (char **strv,