util: Further tweaks to virstring

[libvirt] [PATCH 4/7] util: Tweak virStringHasSuffix()

Posted by Andrea Bolognani 6 years, 11 months ago

Make it more similar to virStringStripSuffix(), which also
results in types being more correct since STRNEQ() returns
int rather than bool.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/util/virstring.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/util/virstring.c b/src/util/virstring.c
index f669d59f58..a938669b63 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -1245,7 +1245,10 @@ virStringHasSuffix(const char *str,
     if (len < suffixlen)
         return false;
 
-    return STREQ(str + len - suffixlen, suffix);
+    if (STRNEQ(str + len - suffixlen, suffix))
+        return false;
+
+    return true;
 }
 
 bool
-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 4/7] util: Tweak virStringHasSuffix()

Posted by Peter Krempa 6 years, 11 months ago

On Thu, Mar 07, 2019 at 11:14:43 +0100, Andrea Bolognani wrote:
> Make it more similar to virStringStripSuffix(), which also
> results in types being more correct since STRNEQ() returns
> int rather than bool.

# define STREQ(a, b) (strcmp(a, b) == 0)
# define STRNEQ(a, b) (strcmp(a, b) != 0)


> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  src/util/virstring.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/util/virstring.c b/src/util/virstring.c
> index f669d59f58..a938669b63 100644
> --- a/src/util/virstring.c
> +++ b/src/util/virstring.c
> @@ -1245,7 +1245,10 @@ virStringHasSuffix(const char *str,
>      if (len < suffixlen)
>          return false;
>  
> -    return STREQ(str + len - suffixlen, suffix);
> +    if (STRNEQ(str + len - suffixlen, suffix))
> +        return false;
> +
> +    return true;

NACK
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list