[tor-commits] [tor/master] Use a compile-time assert in control_events.h

[nickm@xxxxxxxxxxxxxx]

commit 98fdc3e41a79625a5f4b51689a7c76fed4228d00
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jan 10 08:55:18 2020 -0500

    Use a compile-time assert in control_events.h
    
    (The original idiom here led clang-format to generating a too-wide line.)
---
 src/feature/control/control_events.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h
index 74bbc0047..535c8e588 100644
--- a/src/feature/control/control_events.h
+++ b/src/feature/control/control_events.h
@@ -12,6 +12,7 @@
 #ifndef TOR_CONTROL_EVENTS_H
 #define TOR_CONTROL_EVENTS_H
 
+#include "lib/cc/ctassert.h"
 #include "core/or/ocirc_event.h"
 #include "core/or/orconn_event.h"
 
@@ -287,10 +288,7 @@ typedef uint64_t event_mask_t;
 
 /* If EVENT_MAX_ ever hits 0x0040, we need to make the mask into a
  * different structure, as it can only handle a maximum left shift of 1<<63. */
-
-#if EVENT_MAX_ >= EVENT_CAPACITY_
-#error control_connection_t.event_mask has an event greater than its capacity
-#endif
+CTASSERT(EVENT_MAX_ < EVENT_CAPACITY_);
 
 #define EVENT_MASK_(e)               (((uint64_t)1)<<(e))
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits