[PATCH 27/40] util: virstring: Remove virStringListHasString

Peter Krempa pkrempa at redhat.com
Sat Feb 6 08:32:49 UTC 2021


All callers were converted to the glib alternative. Providing our own
just to have NULL tolerance doesn't make sense.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/libvirt_private.syms |  1 -
 src/util/virstring.c     | 17 -----------------
 src/util/virstring.h     |  3 ---
 3 files changed, 21 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d215665ee0..ab8cf62552 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3241,7 +3241,6 @@ virStringHasSuffix;
 virStringIsEmpty;
 virStringIsPrintable;
 virStringListFreeCount;
-virStringListHasString;
 virStringListJoin;
 virStringListLength;
 virStringListMerge;
diff --git a/src/util/virstring.c b/src/util/virstring.c
index 516b898223..c0393585e2 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -221,23 +221,6 @@ virStringListFreeCount(char **strings,
 }


-bool
-virStringListHasString(const char **strings,
-                       const char *needle)
-{
-    size_t i = 0;
-
-    if (!strings)
-        return false;
-
-    while (strings[i]) {
-        if (STREQ(strings[i++], needle))
-            return true;
-    }
-
-    return false;
-}
-
 /* 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 4705b9c141..1a15812307 100644
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -43,9 +43,6 @@ int virStringListMerge(char ***dst,
 void virStringListFreeCount(char **strings,
                             size_t count);

-bool virStringListHasString(const char **strings,
-                            const char *needle);
-
 int virStrToLong_i(char const *s,
                    char **end_ptr,
                    int base,
-- 
2.29.2




More information about the libvir-list mailing list