mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
With coccinelle, avoid includes in the middle of an expression.
This commit is contained in:
@@ -765,7 +765,9 @@ static const config_var_t option_vars_[] = {
|
||||
|
||||
/** List of default directory authorities */
|
||||
static const char *default_authorities[] = {
|
||||
#ifndef COCCI
|
||||
#include "auth_dirs.inc"
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
@@ -773,7 +775,9 @@ static const char *default_authorities[] = {
|
||||
* relays that meet certain stability criteria.
|
||||
*/
|
||||
static const char *default_fallbacks[] = {
|
||||
#ifndef COCCI
|
||||
#include "fallback_dirs.inc"
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
@@ -783,7 +787,9 @@ static const struct {
|
||||
const char *k;
|
||||
const char *v;
|
||||
} testing_tor_network_defaults[] = {
|
||||
#ifndef COCCI
|
||||
#include "testnet.inc"
|
||||
#endif
|
||||
{ NULL, NULL }
|
||||
};
|
||||
|
||||
|
||||
@@ -16,7 +16,9 @@
|
||||
|
||||
/** List of tokens recognized in V3 authority certificates. */
|
||||
static token_rule_t dir_key_certificate_table[] = {
|
||||
#ifndef COCCI
|
||||
#include "feature/dirparse/authcert_members.i"
|
||||
#endif
|
||||
T1("fingerprint", K_FINGERPRINT, CONCAT_ARGS, NO_OBJ ),
|
||||
END_OF_TABLE
|
||||
};
|
||||
|
||||
@@ -84,7 +84,9 @@ static token_rule_t networkstatus_token_table[] = {
|
||||
T01("required-relay-protocols", K_REQUIRED_RELAY_PROTOCOLS,
|
||||
CONCAT_ARGS, NO_OBJ ),
|
||||
|
||||
#ifndef COCCI
|
||||
#include "feature/dirparse/authcert_members.i"
|
||||
#endif
|
||||
|
||||
T0N("opt", K_OPT, CONCAT_ARGS, OBJ_OK ),
|
||||
T1( "contact", K_CONTACT, CONCAT_ARGS, NO_OBJ ),
|
||||
|
||||
@@ -464,7 +464,9 @@ static const char UNRESTRICTED_SERVER_CIPHER_LIST[] =
|
||||
/** List of ciphers that clients should advertise, omitting items that
|
||||
* our OpenSSL doesn't know about. */
|
||||
static const char CLIENT_CIPHER_LIST[] =
|
||||
#ifndef COCCI
|
||||
#include "lib/tls/ciphers.inc"
|
||||
#endif
|
||||
/* Tell it not to use SSLv2 ciphers, so that it can select an SSLv3 version
|
||||
* of any cipher we say. */
|
||||
"!SSLv2"
|
||||
|
||||
@@ -11,14 +11,18 @@
|
||||
* src/core/include.am, and is usually right.
|
||||
*/
|
||||
const char tor_git_revision[] =
|
||||
#ifndef COCCI
|
||||
#ifndef _MSC_VER
|
||||
#include "micro-revision.i"
|
||||
#endif
|
||||
#endif
|
||||
"";
|
||||
|
||||
const char tor_bug_suffix[] = " (on Tor " VERSION
|
||||
#ifndef COCCI
|
||||
#ifndef _MSC_VER
|
||||
" "
|
||||
#include "micro-revision.i"
|
||||
#endif
|
||||
#endif
|
||||
")";
|
||||
|
||||
@@ -3815,7 +3815,9 @@ static void
|
||||
test_config_default_fallback_dirs(void *arg)
|
||||
{
|
||||
const char *fallback[] = {
|
||||
#ifndef COCCI
|
||||
#include "app/config/fallback_dirs.inc"
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user