[libvirt] [PATCH] internal: Use g_strcmp0 in STR(N)EQ_NULLABLE

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/internal.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/internal.h b/src/internal.h index 5b0a2335f5..0ff9f496ac 100644 --- a/src/internal.h +++ b/src/internal.h @@ -86,10 +86,8 @@ #define STRCASEPREFIX(a, b) (c_strncasecmp(a, b, strlen(b)) == 0) #define STRSKIP(a, b) (STRPREFIX(a, b) ? (a) + strlen(b) : NULL) -#define STREQ_NULLABLE(a, b) \ - ((a) ? (b) && STREQ((a), (b)) : !(b)) -#define STRNEQ_NULLABLE(a, b) \ - ((a) ? !(b) || STRNEQ((a), (b)) : !!(b)) +#define STREQ_NULLABLE(a, b) (g_strcmp0(a, b) == 0) +#define STRNEQ_NULLABLE(a, b) (g_strcmp0(a, b) != 0) #define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0) -- 2.21.0