October 2019 - tor-commits - lists.torproject.org

[tor/master] Fix a macro in address.c so coccinelle can understand it
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 9f50a92a7e858591f65bb9c6f0a2b164032bccc6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:50:08 2019 -0400 Fix a macro in address.c so coccinelle can understand it --- src/lib/net/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 0a2c84caf..dd6a83974 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1392,7 +1392,7 @@ get_interface_addresses_win32(int severity, sa_family_t family) /* This is defined on Mac OS X */ #ifndef _SIZEOF_ADDR_IFREQ -#define _SIZEOF_ADDR_IFREQ sizeof +#define _SIZEOF_ADDR_IFREQ(x) sizeof(x) #endif /* Free ifc->ifc_buf safely. */

1 0

[tor/master] ratelim.h: use COCCI to hide an initializer.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 189375fb5dfb6757f1aa0ed36532d933fc382e1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 13:09:44 2019 -0400 ratelim.h: use COCCI to hide an initializer. --- src/lib/log/ratelim.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/log/ratelim.h b/src/lib/log/ratelim.h index 1db54ba72..64f52df66 100644 --- a/src/lib/log/ratelim.h +++ b/src/lib/log/ratelim.h @@ -45,7 +45,9 @@ typedef struct ratelim_t { int n_calls_since_last_time; } ratelim_t; +#ifndef COCCI #define RATELIM_INIT(r) { (r), 0, 0 } +#endif #define RATELIM_TOOMANY (16*1000*1000) char *rate_limit_log(ratelim_t *lim, time_t now);

1 0

[tor/master] util_bug.h: Coccinelle does not understand IF_BUG_ONCE or #nodef.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit c77f57d37bbea4e7281c2de95a9f19b885290111 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 13:07:15 2019 -0400 util_bug.h: Coccinelle does not understand IF_BUG_ONCE or #nodef. --- src/lib/log/util_bug.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 546ae1e3e..8c233da73 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -131,7 +131,9 @@ #undef BUG // Coverity defines this in global headers; let's override it. This is a // magic coverity-only preprocessor thing. +#ifndef COCCI #nodef BUG(x) (x) +#endif #endif /* defined(__COVERITY__) */ #if defined(__COVERITY__) || defined(__clang_analyzer__) @@ -200,6 +202,7 @@ : 0) #endif /* defined(ALL_BUGS_ARE_FATAL) || ... */ +#ifndef COCCI #ifdef __GNUC__ #define IF_BUG_ONCE__(cond,var) \ if (( { \ @@ -208,7 +211,7 @@ if (bool_result && !var) { \ var = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ - "!("#cond")", 1, NULL); \ + ("!("#cond")"), 1, NULL); \ } \ bool_result; } )) #else /* !(defined(__GNUC__)) */ @@ -218,10 +221,12 @@ (var ? 1 : \ (var=1, \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ - "!("#cond")", 1, NULL), \ + ("!("#cond")"), 1, NULL), \ 1)) \ : 0) #endif /* defined(__GNUC__) */ +#endif + #define IF_BUG_ONCE_VARNAME_(a) \ warning_logged_on_ ## a ## __ #define IF_BUG_ONCE_VARNAME__(a) \

1 0

[tor/master] timeval.h: Coccinelle cannot understand timercmp.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 2695f7e68c23612804c9f74f33701eed4c949d70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:51:56 2019 -0400 timeval.h: Coccinelle cannot understand timercmp. --- src/lib/wallclock/timeval.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/wallclock/timeval.h b/src/lib/wallclock/timeval.h index e632d04a0..897a86441 100644 --- a/src/lib/wallclock/timeval.h +++ b/src/lib/wallclock/timeval.h @@ -69,6 +69,7 @@ } while (0) #endif /* !defined(timersub) */ +#ifndef COCCI #ifndef timercmp /** Replacement for timercmp on platforms that do not have it: returns true * iff the relational operator "op" makes the expression tv1 op tv2 true. @@ -82,5 +83,6 @@ ((tv1)->tv_usec op (tv2)->tv_usec) : \ ((tv1)->tv_sec op (tv2)->tv_sec)) #endif /* !defined(timercmp) */ +#endif #endif /* !defined(TOR_TIMEVAL_H) */

1 0

[tor/master] threads.h: coccinelle cannot understand a macro.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 0b862a7616cfac4db2c85288abf59916b662f03b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 13:13:54 2019 -0400 threads.h: coccinelle cannot understand a macro. --- src/lib/thread/threads.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/thread/threads.h b/src/lib/thread/threads.h index ecf60641b..fcce65193 100644 --- a/src/lib/thread/threads.h +++ b/src/lib/thread/threads.h @@ -106,7 +106,9 @@ void tor_threadlocal_set(tor_threadlocal_t *threadlocal, void *value); typedef struct atomic_counter_t { atomic_size_t val; } atomic_counter_t; +#ifndef COCCI #define ATOMIC_LINKAGE static +#endif #else /* !(defined(HAVE_WORKING_STDATOMIC)) */ typedef struct atomic_counter_t { tor_mutex_t mutex;

1 0

[tor/master] Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit d1cdb1a24e6289d5ce6f2c1433395abae7185e6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:57:37 2019 -0400 Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it. --- src/lib/string/parse_int.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/string/parse_int.c b/src/lib/string/parse_int.c index fbdd554a4..fd4422ecd 100644 --- a/src/lib/string/parse_int.c +++ b/src/lib/string/parse_int.c @@ -9,6 +9,7 @@ **/ #include "lib/string/parse_int.h" +#include "lib/cc/compat_compiler.h" #include <errno.h> #include <stdlib.h> @@ -17,6 +18,7 @@ /* Helper: common code to check whether the result of a strtol or strtoul or * strtoll is correct. */ #define CHECK_STRTOX_RESULT() \ + STMT_BEGIN \ /* Did an overflow occur? */ \ if (errno == ERANGE) \ goto err; \ @@ -38,7 +40,8 @@ err: \ if (ok) *ok = 0; \ if (next) *next = endptr; \ - return 0 + return 0; \ + STMT_END /** Extract a long from the start of s, in the given numeric * base. If base is 0, s is parsed as a decimal,

1 0

[tor/master] feature/control: wrap some problem macros in COCCI
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 54c5366aa15d667484a93abf16d166db7981a0ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:36:47 2019 -0400 feature/control: wrap some problem macros in COCCI --- src/feature/control/control_cmd.c | 2 ++ src/feature/control/control_events.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index ad4a4ef0a..999095edb 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -2245,6 +2245,7 @@ typedef struct control_cmd_def_t { */ #define CMD_FL_WIPE (1u<<0) +#ifndef COCCI /** Macro: declare a command with a one-line argument, a given set of flags, * and a syntax definition. **/ @@ -2277,6 +2278,7 @@ typedef struct control_cmd_def_t { 0, \ &obsolete_syntax, \ } +#endif /** * An array defining all the recognized controller commands. diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 82ea94399..cc6b5019b 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1660,6 +1660,7 @@ control_event_status(int type, int severity, const char *format, va_list args) return 0; } +#ifndef COCCI #define CONTROL_EVENT_STATUS_BODY(event, sev) \ int r; \ do { \ @@ -1671,6 +1672,7 @@ control_event_status(int type, int severity, const char *format, va_list args) r = control_event_status((event), (sev), format, ap); \ va_end(ap); \ } while (0) +#endif /** Format and send an EVENT_STATUS_GENERAL event whose main text is obtained * by formatting the arguments using the printf-style format. */

1 0

[tor/master] dispatch_naming.c: when COCCI is defined, disable unparseable macros.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 9453746b5e2276e26c4aaadba99aec2530889ea0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:47:21 2019 -0400 dispatch_naming.c: when COCCI is defined, disable unparseable macros. --- src/lib/dispatch/dispatch_naming.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/dispatch/dispatch_naming.c b/src/lib/dispatch/dispatch_naming.c index 83d9a2d60..79411cb3a 100644 --- a/src/lib/dispatch/dispatch_naming.c +++ b/src/lib/dispatch/dispatch_naming.c @@ -33,6 +33,7 @@ dispatch_naming_init(void) { } +#ifndef COCCI /* Helper macro: declare functions to map IDs to and from names for a given * type in a namemap_t. */ @@ -56,6 +57,7 @@ dispatch_naming_init(void) return namemap_get_size(&type##_id_map); \ } \ EAT_SEMICOLON +#endif DECLARE_ID_MAP_FNS(message); DECLARE_ID_MAP_FNS(channel);

1 0

[tor/master] weakrng.h: use COCCI to hide a macro coccinelle cannot parse.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit fb4b6b64360659d7f9807fe9284cf3eab2e64ff3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:59:22 2019 -0400 weakrng.h: use COCCI to hide a macro coccinelle cannot parse. --- src/lib/intmath/weakrng.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/intmath/weakrng.h b/src/lib/intmath/weakrng.h index 40941e59b..d583c8f79 100644 --- a/src/lib/intmath/weakrng.h +++ b/src/lib/intmath/weakrng.h @@ -19,8 +19,11 @@ typedef struct tor_weak_rng_t { uint32_t state; } tor_weak_rng_t; +#ifndef COCCI #define TOR_WEAK_RNG_INIT {383745623} +#endif #define TOR_WEAK_RANDOM_MAX (INT_MAX) + void tor_init_weak_random(tor_weak_rng_t *weak_rng, unsigned seed); int32_t tor_weak_random(tor_weak_rng_t *weak_rng); int32_t tor_weak_random_range(tor_weak_rng_t *rng, int32_t top);

1 0

[tor/master] tor-coccinelle.h: add a definition for EXTERN
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit d6ce8527f8795c3385320baa17e080bde999e29a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 11:14:28 2019 -0400 tor-coccinelle.h: add a definition for EXTERN --- scripts/coccinelle/tor-coccinelle.h | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/coccinelle/tor-coccinelle.h b/scripts/coccinelle/tor-coccinelle.h index 0727caa4d..c83dce3c5 100644 --- a/scripts/coccinelle/tor-coccinelle.h +++ b/scripts/coccinelle/tor-coccinelle.h @@ -22,6 +22,7 @@ #define CHECK_PRINTF(a, b) #define CHECK_SCANF(a, b) #define STATIC static +#define EXTERN(a,b) extern a b; #define STMT_BEGIN do { #define STMT_END } while (0)

1 0