From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 Oct 2019 13:28:35 +0000 (-0400)
Subject: COCCI: Disable some buffers.c macros that coccinelle can't handle.
X-Git-Tag: tor-0.4.3.1-alpha~262^2~1^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b03c8c74ce87e44fc74e84183fe883018b43f088;p=thirdparty%2Ftor.git

COCCI: Disable some buffers.c macros that coccinelle can't handle.
---

diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c
index 4d026bd37d..3828583855 100644
--- a/src/lib/buf/buffers.c
+++ b/src/lib/buf/buffers.c
@@ -99,6 +99,7 @@
 #define DBG_S(s) (void)0
 #endif
 
+#ifndef COCCI
 #ifdef DISABLE_MEMORY_SENTINELS
 #define CHUNK_SET_SENTINEL(chunk, alloclen) STMT_NIL
 #else
@@ -109,6 +110,7 @@
     memset(a,0,SENTINEL_LEN);                                           \
   } while (0)
 #endif /* defined(DISABLE_MEMORY_SENTINELS) */
+#endif
 
 /** Move all bytes stored in <b>chunk</b> to the front of <b>chunk</b>->mem,
  * to free up space at the end. */