From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 2 Dec 2021 09:48:54 +0000 (+0100)
Subject: VIR_REQUIRE_FLAG_(GOTO|RET): Add parens around arguments in expansion
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=21a9be4412d8f8aca22e55ac2d05146143b468c5;p=libvirt.git

VIR_REQUIRE_FLAG_(GOTO|RET): Add parens around arguments in expansion

Make the macro useful also for cases when one of multiple flags is
required.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/internal.h b/src/internal.h
index 2e404cd705..b6e4332542 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -374,7 +374,7 @@
  */
 #define VIR_REQUIRE_FLAG_RET(FLAG1, FLAG2, RET) \
     do { \
-        if ((flags & FLAG1) && !(flags & FLAG2)) { \
+        if ((flags & (FLAG1)) && !(flags & (FLAG2))) { \
             virReportInvalidArg(ctl, \
                                 _("Flag '%s' is required by flag '%s'"), \
                                 #FLAG2, #FLAG1); \
@@ -396,7 +396,7 @@
  */
 #define VIR_REQUIRE_FLAG_GOTO(FLAG1, FLAG2, LABEL) \
     do { \
-        if ((flags & FLAG1) && !(flags & FLAG2)) { \
+        if ((flags & (FLAG1)) && !(flags & (FLAG2))) { \
             virReportInvalidArg(ctl, \
                                 _("Flag '%s' is required by flag '%s'"), \
                                 #FLAG2, #FLAG1); \