[tor-commits] [tor/master] feature/control: wrap some problem macros in COCCI

[teor at torproject.org]

commit 54c5366aa15d667484a93abf16d166db7981a0ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 9 12:36:47 2019 -0400

    feature/control: wrap some problem macros in COCCI
---
 src/feature/control/control_cmd.c    | 2 ++
 src/feature/control/control_events.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c
index ad4a4ef0a..999095edb 100644
--- a/src/feature/control/control_cmd.c
+++ b/src/feature/control/control_cmd.c
@@ -2245,6 +2245,7 @@ typedef struct control_cmd_def_t {
  */
 #define CMD_FL_WIPE (1u<<0)
 
+#ifndef COCCI
 /** Macro: declare a command with a one-line argument, a given set of flags,
  * and a syntax definition.
  **/
@@ -2277,6 +2278,7 @@ typedef struct control_cmd_def_t {
       0,                                        \
       &obsolete_syntax,                         \
   }
+#endif
 
 /**
  * An array defining all the recognized controller commands.
diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c
index 82ea94399..cc6b5019b 100644
--- a/src/feature/control/control_events.c
+++ b/src/feature/control/control_events.c
@@ -1660,6 +1660,7 @@ control_event_status(int type, int severity, const char *format, va_list args)
   return 0;
 }
 
+#ifndef COCCI
 #define CONTROL_EVENT_STATUS_BODY(event, sev)                   \
   int r;                                                        \
   do {                                                          \
@@ -1671,6 +1672,7 @@ control_event_status(int type, int severity, const char *format, va_list args)
     r = control_event_status((event), (sev), format, ap);       \
     va_end(ap);                                                 \
   } while (0)
+#endif
 
 /** Format and send an EVENT_STATUS_GENERAL event whose main text is obtained
  * by formatting the arguments using the printf-style <b>format</b>. */