util: Rename virFileStripSuffix() to virStringStripSuffix()

Despite its name, this is really just a general-purpose string
manipulation function, so it should be moved to the virstring
module and renamed accordingly.

A few trivial whitespace changes are squashed in.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
ACKed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index 0e943d0a6c51af54d9c80796938664a6fe495ad5..7742de94f25232077556fa1ed8594170b8316086 100644 (file)
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -597,7 +597,7 @@ virDomainObjListLoadAllConfigs(virDomainObjListPtr doms,
     while ((ret = virDirRead(dir, &entry, configDir)) > 0) {
         virDomainObjPtr dom;
 
-        if (!virFileStripSuffix(entry->d_name, ".xml"))
+        if (!virStringStripSuffix(entry->d_name, ".xml"))
             continue;
 
         /* NB: ignoring errors, so one malformed config doesn't

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index ae1264325a425b8d5820660d9d2f94af39ad83a4..c9336e04726f9f447c0df1470c0df8a127a53148 100644 (file)
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -1068,7 +1068,7 @@ virNetworkObjLoadAllState(virNetworkObjListPtr nets,
     while ((ret = virDirRead(dir, &entry, stateDir)) > 0) {
         virNetworkObjPtr obj;
 
-        if (!virFileStripSuffix(entry->d_name, ".xml"))
+        if (!virStringStripSuffix(entry->d_name, ".xml"))
             continue;
 
         obj = virNetworkLoadState(nets, stateDir, entry->d_name);
@@ -1096,7 +1096,7 @@ virNetworkObjLoadAllConfigs(virNetworkObjListPtr nets,
     while ((ret = virDirRead(dir, &entry, configDir)) > 0) {
         virNetworkObjPtr obj;
 
-        if (!virFileStripSuffix(entry->d_name, ".xml"))
+        if (!virStringStripSuffix(entry->d_name, ".xml"))
             continue;
 
         /* NB: ignoring errors, so one malformed config doesn't

diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index 887c7c7b097bc014cec24b2f4a6852212db9d75b..06ccbf53afdfffe4649e340451d1612a9ad9e1fe 100644 (file)
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -304,7 +304,7 @@ virNWFilterBindingObjListLoadAllConfigs(virNWFilterBindingObjListPtr bindings,
     while ((ret = virDirRead(dir, &entry, configDir)) > 0) {
         virNWFilterBindingObjPtr binding;
 
-        if (!virFileStripSuffix(entry->d_name, ".xml"))
+        if (!virStringStripSuffix(entry->d_name, ".xml"))
             continue;
 
         /* NB: ignoring errors, so one malformed config doesn't

diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c
index 0136a0d56ce894b79d625cbc18e59c7820e0ee73..d2d957a1cc090ee87cda75ba27b0aa3ef2fb9b20 100644 (file)
--- a/src/conf/virnwfilterobj.c
+++ b/src/conf/virnwfilterobj.c
@@ -547,7 +547,7 @@ virNWFilterObjListLoadAllConfigs(virNWFilterObjListPtr nwfilters,
     while ((ret = virDirRead(dir, &entry, configDir)) > 0) {
         virNWFilterObjPtr obj;
 
-        if (!virFileStripSuffix(entry->d_name, ".xml"))
+        if (!virStringStripSuffix(entry->d_name, ".xml"))
             continue;
 
         obj = virNWFilterObjListLoadConfig(nwfilters, configDir, entry->d_name);

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 68c89bd9a9083f4cc8038b219a32347d91acc2ee..85b6dd3695ddd88291aea9dd3f9a5ed14bacb647 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -1688,7 +1688,7 @@ virStoragePoolObjLoadAllState(virStoragePoolObjListPtr pools,
     while ((ret = virDirRead(dir, &entry, stateDir)) > 0) {
         virStoragePoolObjPtr obj;
 
-        if (!virFileStripSuffix(entry->d_name, ".xml"))
+        if (!virStringStripSuffix(entry->d_name, ".xml"))
             continue;
 
         if (!(obj = virStoragePoolObjLoadState(pools, stateDir, entry->d_name)))

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 9b4aee50d56724c431d66ef1fa568b25ab59fe24..e057ed0f2cc35a87ef50ed7118dee17867050e5c 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1890,7 +1890,6 @@ virFileSetACLs;
 virFileSetupDev;
 virFileSetXAttr;
 virFileSkipRoot;
-virFileStripSuffix;
 virFileTouch;
 virFileUnlock;
 virFileUpdatePerm;
@@ -2990,6 +2989,7 @@ virStringSplit;
 virStringSplitCount;
 virStringStripControlChars;
 virStringStripIPv6Brackets;
+virStringStripSuffix;
 virStringToUpper;
 virStringTrimOptionalNewline;
 virStrncpy;

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 21f7dc1ac39154782c103850716a19cb6770c000..c0f3f562937ba0ba78d1b8d436dc0b971c816523 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -1044,24 +1044,6 @@ int virFileDeleteTree(const char *dir)
     return ret;
 }
 
-int
-virFileStripSuffix(char *str, const char *suffix)
-{
-    int len = strlen(str);
-    int suffixlen = strlen(suffix);
-
-    if (len < suffixlen)
-        return 0;
-
-    if (STRNEQ(str + len - suffixlen, suffix))
-        return 0;
-
-    str[len-suffixlen] = '\0';
-
-    return 1;
-}
-
-
 /* Like read(), but restarts after EINTR.  Doesn't play
  * nicely with nonblocking FD and EAGAIN, in which case
  * you want to use bare read(). Or even use virSocket()

diff --git a/src/util/virfile.h b/src/util/virfile.h
index 5a43d57181da862e7d50094b2f0e5f6948f57b53..0079e234f8c19f538e4fe435c3b198297cff9588 100644 (file)
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -166,9 +166,6 @@ int virFileMatchesNameSuffix(const char *file,
                              const char *name,
                              const char *suffix);
 
-int virFileStripSuffix(char *str,
-                       const char *suffix) ATTRIBUTE_RETURN_CHECK;
-
 int virFileLinkPointsTo(const char *checkLink,
                         const char *checkDest)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);

diff --git a/src/util/virstring.c b/src/util/virstring.c
index 399b9468e643e30c66aa460a9cd52609f81926e0..60b4167af4a9e4c811feeef95d99d8120d4e0185 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -1248,6 +1248,24 @@ virStringHasCaseSuffix(const char *str,
     return STRCASEEQ(str + len - suffixlen, suffix);
 }
 
+int
+virStringStripSuffix(char *str,
+                     const char *suffix)
+{
+    int len = strlen(str);
+    int suffixlen = strlen(suffix);
+
+    if (len < suffixlen)
+        return 0;
+
+    if (STRNEQ(str + len - suffixlen, suffix))
+        return 0;
+
+    str[len - suffixlen] = '\0';
+
+    return 1;
+}
+
 /**
  * virStringStripIPv6Brackets:
  * @str: the string to strip

diff --git a/src/util/virstring.h b/src/util/virstring.h
index b2ba97a8d18fd1dd764ef78e6b343395c0b4269a..580e4da9b9224f4463be74919a5e633e56994f3a 100644 (file)
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -290,6 +290,8 @@ char *virStringReplace(const char *haystack,
 
 int virStringHasCaseSuffix(const char *str,
                            const char *suffix);
+int virStringStripSuffix(char *str,
+                         const char *suffix) ATTRIBUTE_RETURN_CHECK;
 
 void virStringStripIPv6Brackets(char *str);
 bool virStringHasChars(const char *str,

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 1736bad03246c52eb3212c55e0790d9144cac983..61bf67d5adf55b2293bfe69e9a1bb0ac1e2b473c 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -834,7 +834,7 @@ testQemuGetLatestCapsForArch(const char *dirname,
         if (rc == 0)
             continue;
 
-        if (virFileStripSuffix(tmp, fullsuffix) != 1)
+        if (virStringStripSuffix(tmp, fullsuffix) != 1)
             continue;
 
         if (virParseVersionString(tmp, &ver, false) < 0) {