From 0eeafeedebe4469fce33d7942551957853856619 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 22 Oct 2014 10:26:42 +0200 Subject: [PATCH] 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. --- src/libvirt_private.syms | 1 + src/util/virstring.c | 16 ++++++++++++++++ src/util/virstring.h | 2 ++ 3 files changed, 19 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9f749b7d84..d6b752ed75 100644 --- 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 df6464a3bf..3dad9dd1a1 100644 --- 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 40ebaebb79..2ec60faa1f 100644 --- 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) -- GitLab