commit b03c8c74ce87e44fc74e84183fe883018b43f088 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 22 09:28:35 2019 -0400

COCCI: Disable some buffers.c macros that coccinelle can't handle. --- src/lib/buf/buffers.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c index 4d026bd37..382858385 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. */