util: virstring: Remove the virStringSplitCount wrapper funcion

Callers which need the count of elements now count it in place.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 3a0e4615cfd3415f825ec4428cec4bf8469091c9..c7b8d18e4252891d677bafdb51ad7d51fb0cb917 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3264,7 +3264,6 @@ virStringReplace;
 virStringSearch;
 virStringSortCompare;
 virStringSortRevCompare;
-virStringSplitCount;
 virStringStripControlChars;
 virStringStripIPv6Brackets;
 virStringStripSuffix;

diff --git a/src/util/virstring.c b/src/util/virstring.c
index 7749eb2db5eb4bda4f1d7eb9884fa47560fb6bc1..a2c07e5c17c0b8758e841b1a0aacc1c75d88aa7f 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -35,26 +35,6 @@
 
 VIR_LOG_INIT("util.string");
 
-/**
- * virStringSplitCount:
- *
- * A wrapper for g_strsplit which provides number of elements of the split
- * string.
- */
-char **
-virStringSplitCount(const char *string,
-                    const char *delim,
-                    size_t max_tokens,
-                    size_t *tokcount)
-{
-    GStrv ret = g_strsplit(string, delim, max_tokens);
-
-    *tokcount = g_strv_length(ret);
-
-    return ret;
-}
-
-
 /**
  * virStringListMerge:
  * @dst: a NULL-terminated array of strings to expand

diff --git a/src/util/virstring.h b/src/util/virstring.h
index e68849557410cc1def1ff64cede32b3a67877480..7cc1d8c55fb6912df04b41f939cde69b3277dbcf 100644 (file)
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -22,12 +22,6 @@
 
 #define VIR_INT64_STR_BUFLEN 21
 
-char **virStringSplitCount(const char *string,
-                           const char *delim,
-                           size_t max_tokens,
-                           size_t *tokcount)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4);
-
 int virStringListMerge(char ***dst,
                        char ***src);