tor

commit d9bad0203bb0926883d8d1513ddc966e84fcc734
parent 67247fa9ac7c2c5b19c0a2b6884ab21f83cc5e5d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  9 Oct 2019 11:10:08 -0400

Disable a couple of iterator macros when COCCI is defined.

Diffstat:
M
src/core/or/circuitpadding.c
 | 
2
++
M
src/feature/hs/hs_service.c
 | 
2
++

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
@@ -116,6 +116,7 @@ STATIC smartlist_t *origin_padding_machines = NULL;
  *  runtime and as long as circuits are alive. */
 STATIC smartlist_t *relay_padding_machines = NULL;
 
+#ifndef COCCI
 /** Loop over the current padding state machines using <b>loop_var</b> as the
  *  loop variable. */
 #define FOR_EACH_CIRCUIT_MACHINE_BEGIN(loop_var)                         \
@@ -130,6 +131,7 @@ STATIC smartlist_t *relay_padding_machines = NULL;
   if (!(circ)->padding_info[loop_var])                           \
     continue;
 #define FOR_EACH_ACTIVE_CIRCUIT_MACHINE_END } STMT_END ;
+#endif
 
 /**
  * Free the machineinfo at an index
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
@@ -67,6 +67,7 @@
 #include <unistd.h>
 #endif
 
+#ifndef COCCI
 /* Helper macro. Iterate over every service in the global map. The var is the
  * name of the service pointer. */
 #define FOR_EACH_SERVICE_BEGIN(var)                          \
@@ -88,6 +89,7 @@
                                 (var = service->desc_next);      \
       if (var == NULL) continue;
 #define FOR_EACH_DESCRIPTOR_END } STMT_END ;
+#endif
 
 /* Onion service directory file names. */
 static const char fname_keyfile_prefix[] = "hs_ed25519";