Permalink
Browse files

EVUTIL_ASSERT: Use sizeof() to avoid "unused variable" warnings.

  • Loading branch information...
1 parent 18adc3f commit b63ab1776b3bbf3fe47406d0ca9639b299c4348d Evan Jones committed with Nick Mathewson Dec 6, 2010
Showing with 11 additions and 1 deletion.
  1. +6 −0 buffer.c
  2. +5 −1 util-internal.h
View
@@ -246,6 +246,12 @@ evbuffer_chains_all_empty(struct evbuffer_chain *chain)
}
return 1;
}
+#else
+/* The definition is needed for EVUTIL_ASSERT, which uses sizeof to avoid
+"unused variable" warnings. */
+static inline int evbuffer_chains_all_empty(struct evbuffer_chain *chain) {
+ return 1;
+}
#endif
static void
View
@@ -52,6 +52,10 @@ extern "C" {
/* A good no-op to use in macro definitions. */
#define _EVUTIL_NIL_STMT ((void)0)
+/* Suppresses the compiler's "unused variable" warnings for unused assert. */
+#define _EVUTIL_NIL_CONDITION(condition) do { \
+ (void)sizeof(condition); \
+} while(0)
/* Internal use only: macros to match patterns of error codes in a
cross-platform way. We need these macros because of two historical
@@ -177,7 +181,7 @@ long _evutil_weakrand(void);
/* Replacement for assert() that calls event_errx on failure. */
#ifdef NDEBUG
-#define EVUTIL_ASSERT(cond) _EVUTIL_NIL_STMT
+#define EVUTIL_ASSERT(cond) _EVUTIL_NIL_CONDITION(cond)
#define EVUTIL_FAILURE_CHECK(cond) 0
#else
#define EVUTIL_ASSERT(cond) \

0 comments on commit b63ab17

Please sign in to comment.