util: string: Add helper to check whether string is empty

The helper checks whether a string contains only whitespace or is NULL.
This will be helpful to skip cases where a user string is optional, but
may be provided empty with the same meaning.

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 9f749b7d84e6bebf3901a35f65ff113a5c9f71e4..d6b752ed75c2204f04d781a918ab7b91bd94f481 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1999,6 +1999,7 @@ virStrdup;
 virStringArrayHasString;
 virStringFreeList;
 virStringFreeListCount;
+virStringIsEmpty;
 virStringJoin;
 virStringListLength;
 virStringReplace;

diff --git a/src/util/virstring.c b/src/util/virstring.c
index df6464a3bfa1d18836bde4542f7932f57df9d112..3dad9dd1a14916f7a4233bd6e93d85598d9b666a 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -633,6 +633,22 @@ virSkipSpacesBackwards(const char *str, char **endp)
         *endp = NULL;
 }
 
+/**
+ * virStringIsEmpty:
+ * @str: string to check
+ *
+ * Returns true if string is empty (may contain only whitespace) or NULL.
+ */
+bool
+virStringIsEmpty(const char *str)
+{
+    if (!str)
+        return true;
+
+    virSkipSpaces(&str);
+    return str[0] == '\0';
+}
+
 char *
 virArgvToString(const char *const *argv)
 {

diff --git a/src/util/virstring.h b/src/util/virstring.h
index 40ebaebb790de2723f8c85686c3227543b45347d..2ec60faa1f3227c72b19a084ab91021f0b4f133b 100644 (file)
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -107,6 +107,8 @@ void virTrimSpaces(char *str, char **endp) ATTRIBUTE_NONNULL(1);
 void virSkipSpacesBackwards(const char *str, char **endp)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
+bool virStringIsEmpty(const char *str);
+
 char *virStrncpy(char *dest, const char *src, size_t n, size_t destbytes)
     ATTRIBUTE_RETURN_CHECK;
 char *virStrcpy(char *dest, const char *src, size_t destbytes)