[tor-commits] [tor/master] Add a "COCCI" macro that we tell coccinelle is always defined.

[teor@xxxxxxxxxxxxxx]

commit a2bb66c3558be224f3537296ee0ebec179164f57
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Oct 9 10:07:50 2019 -0400

    Add a "COCCI" macro that we tell coccinelle is always defined.
    
    This will let us give specific in-file equivalents to given macros
    or preprocessor directives, to make things parse.
---
 scripts/coccinelle/apply.sh     | 2 +-
 scripts/coccinelle/try_parse.sh | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/coccinelle/apply.sh b/scripts/coccinelle/apply.sh
index 82e773dc3..f531d7fa3 100755
--- a/scripts/coccinelle/apply.sh
+++ b/scripts/coccinelle/apply.sh
@@ -6,4 +6,4 @@
 top="$(dirname "$0")/../.."
 
 spatch -macro_file_builtins "$top"/scripts/coccinelle/tor-coccinelle.h \
-       -I "$top" -I "$top"/src -I "$top"/ext "$@"
+       -I "$top" -I "$top"/src -I "$top"/ext --defined COCCI "$@"
diff --git a/scripts/coccinelle/try_parse.sh b/scripts/coccinelle/try_parse.sh
index 303324294..0f91e3170 100755
--- a/scripts/coccinelle/try_parse.sh
+++ b/scripts/coccinelle/try_parse.sh
@@ -10,14 +10,16 @@ exitcode=0
 for fn in "$@"; do
 
     if spatch -macro_file_builtins "$top"/scripts/coccinelle/tor-coccinelle.h \
-              -I "$top" -I "$top"/src -I "$top"/ext --parse-c "$fn" \
+              -I "$top" -I "$top"/src -I "$top"/ext --defined COCCI \
+              --parse-c "$fn" \
               2>/dev/null | grep "perfect = 1" > /dev/null; then
         : # it's perfect
     else
         echo "$fn"
         if test "${VERBOSE}" != ""; then
             spatch -macro_file_builtins "$top"/scripts/coccinelle/tor-coccinelle.h \
-                   -I "$top" -I "$top"/src -I "$top"/ext --parse-c "$fn"
+                   -I "$top" -I "$top"/src -I "$top"/ext --defined COCCI \
+                   --parse-c "$fn"
         fi
         exitcode=1
     fi



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits