nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 21:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/1663'

Browse Source
This commit is contained in:
Nick Mathewson 2020-01-16 10:24:39 -05:00
commit 17c63ff9f6
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/main/main.c
View File

@ -1240,7 +1240,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
int done = 0;
result = nt_service_parse_options(argc, argv, &done);
if (done)
if (POSSIBLE(done))
goto done;
pubsub_install();

13
src/lib/cc/compat_compiler.h
View File

@ -227,4 +227,17 @@
#define EAT_SEMICOLON \
struct dummy_semicolon_eater__
/**
* Tell our static analysis tool to believe that (clang's scan-build or
* coverity scan) that an expression might be true. We use this to suppress
* dead-code warnings.
**/
#if defined(__COVERITY__) || defined(__clang_analyzer__)
/* By calling getenv, we force the analyzer not to conclude that 'expr' is
* false. */
#define POSSIBLE(expr) ((expr) || getenv("STATIC_ANALYZER_DEADCODE_DUMMY_"))
#else
#define POSSIBLE(expr) (expr)
#endif
#endif /* !defined(TOR_COMPAT_COMPILER_H) */