From: Martin Kletzander <mkletzan@redhat.com>
Date: Tue, 9 Feb 2016 15:01:33 +0000 (+0100)
Subject: util: Get rid of virStringListLen()
X-Git-Tag: v1.3.2-rc1~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea913d185df9ac60a04aa5968198a382d8c8be0d;p=thirdparty%2Flibvirt.git

util: Get rid of virStringListLen()

It does exactly the same thing as virStringListLength() and it's used in
one place only.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c
index ae7ec132b2..8da91f2cdb 100644
--- a/src/util/virpolkit.c
+++ b/src/util/virpolkit.c
@@ -90,7 +90,7 @@ int virPolkitCheckAuth(const char *actionid,
                           "start-time", "t", startTime,
                           "uid", "i", (int)uid,
                           actionid,
-                          virStringListLen(details) / 2,
+                          virStringListLength(details) / 2,
                           details,
                           allowInteraction,
                           "" /* cancellation ID */) < 0)
diff --git a/src/util/virstring.c b/src/util/virstring.c
index 8cd4bdd16e..fc4f5ba7e6 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -208,20 +208,6 @@ virStringFreeListCount(char **strings,
 }
 
 
-size_t virStringListLen(const char **strings)
-{
-    size_t i = 0;
-
-    if (!strings)
-        return 0;
-
-    while (strings[i] != NULL)
-        i++;
-
-    return i;
-}
-
-
 bool
 virStringArrayHasString(char **strings, const char *needle)
 {
diff --git a/src/util/virstring.h b/src/util/virstring.h
index df5928fb13..cdf1058825 100644
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -44,8 +44,6 @@ char *virStringJoin(const char **strings,
 void virStringFreeList(char **strings);
 void virStringFreeListCount(char **strings, size_t count);
 
-size_t virStringListLen(const char **strings);
-
 bool virStringArrayHasString(char **strings, const char *needle);
 char *virStringGetFirstWithPrefix(char **strings, const char *prefix)
     ATTRIBUTE_NONNULL(2);