|
 |
e6dfe8 |
From a2798982df8432b5d26f247516ca5a43e0a94c58 Mon Sep 17 00:00:00 2001
|
|
|
e6dfe8 |
Message-Id: <a2798982df8432b5d26f247516ca5a43e0a94c58@dist-git>
|
|
|
e6dfe8 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
e6dfe8 |
Date: Mon, 9 Apr 2018 15:46:48 +0200
|
|
|
e6dfe8 |
Subject: [PATCH] util: Introduce virStringListMerge
|
|
|
e6dfe8 |
MIME-Version: 1.0
|
|
|
e6dfe8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
e6dfe8 |
Content-Transfer-Encoding: 8bit
|
|
|
e6dfe8 |
|
|
|
e6dfe8 |
https://bugzilla.redhat.com/show_bug.cgi?id=1564996
|
|
|
e6dfe8 |
|
|
|
e6dfe8 |
For two string lists merge one into the other one.
|
|
|
e6dfe8 |
|
|
|
e6dfe8 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
e6dfe8 |
(cherry picked from commit 72bf14d3456373130cd47157c0062e9125318716)
|
|
|
e6dfe8 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
e6dfe8 |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
e6dfe8 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
e6dfe8 |
---
|
|
|
e6dfe8 |
src/libvirt_private.syms | 1 +
|
|
|
e6dfe8 |
src/util/virstring.c | 36 ++++++++++++++++++++++++++++++++++++
|
|
|
e6dfe8 |
src/util/virstring.h | 3 +++
|
|
|
e6dfe8 |
3 files changed, 40 insertions(+)
|
|
|
e6dfe8 |
|
|
|
e6dfe8 |
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
|
|
|
e6dfe8 |
index 9c64d0cb97..15cc83931a 100644
|
|
|
e6dfe8 |
--- a/src/libvirt_private.syms
|
|
|
e6dfe8 |
+++ b/src/libvirt_private.syms
|
|
|
e6dfe8 |
@@ -2775,6 +2775,7 @@ virStringListGetFirstWithPrefix;
|
|
|
e6dfe8 |
virStringListHasString;
|
|
|
e6dfe8 |
virStringListJoin;
|
|
|
e6dfe8 |
virStringListLength;
|
|
|
e6dfe8 |
+virStringListMerge;
|
|
|
e6dfe8 |
virStringListRemove;
|
|
|
e6dfe8 |
virStringMatch;
|
|
|
e6dfe8 |
virStringParsePort;
|
|
|
e6dfe8 |
diff --git a/src/util/virstring.c b/src/util/virstring.c
|
|
|
e6dfe8 |
index b2ebce27ff..47d9efba25 100644
|
|
|
e6dfe8 |
--- a/src/util/virstring.c
|
|
|
e6dfe8 |
+++ b/src/util/virstring.c
|
|
|
e6dfe8 |
@@ -239,6 +239,42 @@ virStringListRemove(char ***strings,
|
|
|
e6dfe8 |
}
|
|
|
e6dfe8 |
|
|
|
e6dfe8 |
|
|
|
e6dfe8 |
+/**
|
|
|
e6dfe8 |
+ * virStringListMerge:
|
|
|
e6dfe8 |
+ * @dst: a NULL-terminated array of strings to expand
|
|
|
e6dfe8 |
+ * @src: a NULL-terminated array of strings
|
|
|
e6dfe8 |
+ *
|
|
|
e6dfe8 |
+ * Merges @src into @dst. Upon successful return from this
|
|
|
e6dfe8 |
+ * function, @dst is resized to $(dst + src) elements and @src is
|
|
|
e6dfe8 |
+ * freed.
|
|
|
e6dfe8 |
+ *
|
|
|
e6dfe8 |
+ * Returns 0 on success, -1 otherwise.
|
|
|
e6dfe8 |
+ */
|
|
|
e6dfe8 |
+int
|
|
|
e6dfe8 |
+virStringListMerge(char ***dst,
|
|
|
e6dfe8 |
+ char ***src)
|
|
|
e6dfe8 |
+{
|
|
|
e6dfe8 |
+ size_t dst_len, src_len, i;
|
|
|
e6dfe8 |
+
|
|
|
e6dfe8 |
+ if (!src || !*src)
|
|
|
e6dfe8 |
+ return 0;
|
|
|
e6dfe8 |
+
|
|
|
e6dfe8 |
+ dst_len = virStringListLength((const char **) *dst);
|
|
|
e6dfe8 |
+ src_len = virStringListLength((const char **) *src);
|
|
|
e6dfe8 |
+
|
|
|
e6dfe8 |
+ if (VIR_REALLOC_N(*dst, dst_len + src_len + 1) < 0)
|
|
|
e6dfe8 |
+ return -1;
|
|
|
e6dfe8 |
+
|
|
|
e6dfe8 |
+ for (i = 0; i <= src_len; i++)
|
|
|
e6dfe8 |
+ (*dst)[i + dst_len] = (*src)[i];
|
|
|
e6dfe8 |
+
|
|
|
e6dfe8 |
+ /* Don't call virStringListFree() as it would free strings in
|
|
|
e6dfe8 |
+ * @src. */
|
|
|
e6dfe8 |
+ VIR_FREE(*src);
|
|
|
e6dfe8 |
+ return 0;
|
|
|
e6dfe8 |
+}
|
|
|
e6dfe8 |
+
|
|
|
e6dfe8 |
+
|
|
|
e6dfe8 |
/**
|
|
|
e6dfe8 |
* virStringListCopy:
|
|
|
e6dfe8 |
* @dst: where to store the copy of @strings
|
|
|
e6dfe8 |
diff --git a/src/util/virstring.h b/src/util/virstring.h
|
|
|
e6dfe8 |
index cfd91be314..1fd43f98b7 100644
|
|
|
e6dfe8 |
--- a/src/util/virstring.h
|
|
|
e6dfe8 |
+++ b/src/util/virstring.h
|
|
|
e6dfe8 |
@@ -46,6 +46,9 @@ char **virStringListAdd(const char **strings,
|
|
|
e6dfe8 |
void virStringListRemove(char ***strings,
|
|
|
e6dfe8 |
const char *item);
|
|
|
e6dfe8 |
|
|
|
e6dfe8 |
+int virStringListMerge(char ***dst,
|
|
|
e6dfe8 |
+ char ***src);
|
|
|
e6dfe8 |
+
|
|
|
e6dfe8 |
int virStringListCopy(char ***dst,
|
|
|
e6dfe8 |
const char **src);
|
|
|
e6dfe8 |
|
|
|
e6dfe8 |
--
|
|
|
e6dfe8 |
2.17.0
|
|
|
e6dfe8 |
|