util: virstring: Remove unused 'virStringListMerge'

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 ace35d709fd80df41205d944277f3b7cc7544225..25ee21463c61b55909327fc3c71bc4fade26022e 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3298,7 +3298,6 @@ virStringHasControlChars;
 virStringHasSuffix;
 virStringIsEmpty;
 virStringIsPrintable;
-virStringListMerge;
 virStringMatch;
 virStringMatchesNameSuffix;
 virStringParsePort;

diff --git a/src/util/virstring.c b/src/util/virstring.c
index f416fed3c594d70b40c138db326b9a48f68842cc..cee56debcaa097e5f7b7214632d95936438b89d9 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -35,41 +35,6 @@
 
 VIR_LOG_INIT("util.string");
 
-/**
- * virStringListMerge:
- * @dst: a NULL-terminated array of strings to expand
- * @src: a NULL-terminated array of strings
- *
- * Merges @src into @dst. Upon successful return from this
- * function, @dst is resized to $(dst + src) elements and @src is
- * freed.
- *
- * Returns 0 on success, -1 otherwise.
- */
-int
-virStringListMerge(char ***dst,
-                   char ***src)
-{
-    size_t dst_len, src_len, i;
-
-    if (!src || !*src)
-        return 0;
-
-    dst_len = g_strv_length(*dst);
-    src_len = g_strv_length(*src);
-
-    VIR_REALLOC_N(*dst, dst_len + src_len + 1);
-
-    for (i = 0; i <= src_len; i++)
-        (*dst)[i + dst_len] = (*src)[i];
-
-    /* Don't call g_strfreev() as it would free strings in
-     * @src. */
-    VIR_FREE(*src);
-    return 0;
-}
-
-
 /* Like strtol, but produce an "int" result, and check more carefully.
    Return 0 upon success;  return -1 to indicate failure.
    When END_PTR is NULL, the byte after the final valid digit must be NUL.

diff --git a/src/util/virstring.h b/src/util/virstring.h
index ca81889c9b27bf51e051418e288dc431f42462cb..45f07ddd7ad7bca466aac19399fa721f5c6b2eb6 100644 (file)
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -22,9 +22,6 @@
 
 #define VIR_INT64_STR_BUFLEN 21
 
-int virStringListMerge(char ***dst,
-                       char ***src);
-
 int virStrToLong_i(char const *s,
                    char **end_ptr,
                    int base,