From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Oct 2019 16:55:37 +0000 (-0400)
Subject: smartlist.h: use COCCI to hide SMARTLIST_FOREACH_JOIN from Coccinelle
X-Git-Tag: tor-0.4.3.1-alpha~262^2~1^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41f44d87604c8b780e9c3a1e60f006633e0a6d1b;p=thirdparty%2Ftor.git

smartlist.h: use COCCI to hide SMARTLIST_FOREACH_JOIN from Coccinelle
---

diff --git a/src/lib/container/smartlist.h b/src/lib/container/smartlist.h
index 25638e4b22..1dadf4ae6b 100644
--- a/src/lib/container/smartlist.h
+++ b/src/lib/container/smartlist.h
@@ -92,6 +92,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join,
                               size_t join_len, int terminate, size_t *len_out)
   ATTR_MALLOC;
 
+#ifndef COCCI
 /* Helper: Given two lists of items, possibly of different types, such that
  * both lists are sorted on some common field (as determined by a comparison
  * expression <b>cmpexpr</b>), and such that one list (<b>sl1</b>) has no
@@ -165,5 +166,6 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join,
 #define SMARTLIST_FOREACH_JOIN_END(var1, var2)  \
   }                                             \
   STMT_END
+#endif
 
 #endif /* !defined(TOR_SMARTLIST_H) */