[6/9] Require a semicolon for VIR_ENUM_IMPL calls

Message ID 55760abbf66bfa58e1857d02d1338fdc4b7494b9.1548283535.git.crobinso@redhat.com
State New
Headers show
Series
  • Add semicolon to macro calls
Related show

Commit Message

Cole Robinson Jan. 23, 2019, 10:46 p.m.
Move the verify() statement to the end of the macro and drop
the semicolon, so the compiler will require callers to add a
semicolon.

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 src/util/virutil.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.1

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

Patch

diff --git a/src/util/virutil.h b/src/util/virutil.h
index d5adab61e2..f8d8d85d27 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -82,7 +82,6 @@  const char *virEnumToString(const char *const*types,
 
 # define VIR_ENUM_IMPL(name, lastVal, ...) \
     static const char *const name ## TypeList[] = { __VA_ARGS__ }; \
-    verify(ARRAY_CARDINALITY(name ## TypeList) == lastVal); \
     const char *name ## TypeToString(int type) { \
         return virEnumToString(name ## TypeList, \
                                ARRAY_CARDINALITY(name ## TypeList), \
@@ -93,6 +92,7 @@  const char *virEnumToString(const char *const*types,
                                  ARRAY_CARDINALITY(name ## TypeList), \
                                  type); \
     } \
+    verify(ARRAY_CARDINALITY(name ## TypeList) == lastVal)
 
 # define VIR_ENUM_DECL(name) \
     const char *name ## TypeToString(int type); \