nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run "make autostyle".

Browse Source
This commit is contained in:
Nick Mathewson 2020-02-12 18:25:51 -05:00
parent 3147cbba52
commit d0c3350218
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/feature/dirauth/process_descs.h
View File

@ -15,7 +15,7 @@
// for was_router_added_t. // for was_router_added_t.
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "src/lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_ed25519.h"
struct authdir_config_t; struct authdir_config_t;
@ -47,7 +47,7 @@ typedef struct authdir_config_t {
#define RTR_BADEXIT 16 /**< We'll tell clients not to use this as an exit. */ #define RTR_BADEXIT 16 /**< We'll tell clients not to use this as an exit. */
/* 32 Historically used to indicade Unnamed */ /* 32 Historically used to indicade Unnamed */
#endif /* defined(TOR_UNIT_TESTS) */ #endif /* defined(PROCESS_DESCS_PRIVATE) || defined(TOR_UNIT_TESTS) */
#ifdef TOR_UNIT_TESTS #ifdef TOR_UNIT_TESTS
@ -55,7 +55,7 @@ void authdir_init_fingerprint_list(void);
authdir_config_t *authdir_return_fingerprint_list(void); authdir_config_t *authdir_return_fingerprint_list(void);
#endif /* defined(PROCESS_DESCS_PRIVATE) || defined(TOR_UNIT_TESTS) */ #endif /* defined(TOR_UNIT_TESTS) */
void dirserv_free_fingerprint_list(void); void dirserv_free_fingerprint_list(void);

4
src/feature/dircache/dirserv.h
View File

@ -93,7 +93,7 @@ void dirserv_set_cached_consensus_networkstatus(const char *consensus,
const common_digests_t *digests, const common_digests_t *digests,
const uint8_t *sha3_as_signed, const uint8_t *sha3_as_signed,
time_t published); time_t published);
#else #else /* !defined(HAVE_MODULE_DIRCACHE) */
#define have_module_dircache() (0) #define have_module_dircache() (0)
#define directory_caches_unknown_auth_certs(opt) \ #define directory_caches_unknown_auth_certs(opt) \
((void)(opt), 0) ((void)(opt), 0)
@ -112,7 +112,7 @@ void dirserv_set_cached_consensus_networkstatus(const char *consensus,
(void)(e); \ (void)(e); \
(void)(f); \ (void)(f); \
} STMT_END } STMT_END
#endif #endif /* defined(HAVE_MODULE_DIRCACHE) */
void dirserv_clear_old_networkstatuses(time_t cutoff); void dirserv_clear_old_networkstatuses(time_t cutoff);
int dirserv_get_routerdesc_spool(smartlist_t *spools_out, const char *key, int dirserv_get_routerdesc_spool(smartlist_t *spools_out, const char *key,

2
src/feature/nodelist/networkstatus.c
View File

@ -102,7 +102,7 @@
#include "feature/nodelist/routerlist_st.h" #include "feature/nodelist/routerlist_st.h"
#include "feature/dirauth/vote_microdesc_hash_st.h" #include "feature/dirauth/vote_microdesc_hash_st.h"
#include "feature/nodelist/vote_routerstatus_st.h" #include "feature/nodelist/vote_routerstatus_st.h"
#include "routerstatus_st.h" #include "feature/nodelist/routerstatus_st.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>

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

@ -238,6 +238,6 @@
#define POSSIBLE(expr) ((expr) || getenv("STATIC_ANALYZER_DEADCODE_DUMMY_")) #define POSSIBLE(expr) ((expr) || getenv("STATIC_ANALYZER_DEADCODE_DUMMY_"))
#else #else
#define POSSIBLE(expr) (expr) #define POSSIBLE(expr) (expr)
#endif #endif /* defined(__COVERITY__) || defined(__clang_analyzer__) */
#endif /* !defined(TOR_COMPAT_COMPILER_H) */ #endif /* !defined(TOR_COMPAT_COMPILER_H) */

4
src/test/test_util.c
View File

@ -1947,7 +1947,7 @@ test_util_expand_filename(void *arg)
done: done:
tor_free(str); tor_free(str);
} }
#endif /* !defined(_WIN32) */ #endif /* !defined(DISABLE_PWDB_TESTS) */
/** Test tor_escape_str_for_pt_args(). */ /** Test tor_escape_str_for_pt_args(). */
static void static void
@ -5763,7 +5763,7 @@ test_util_pwdb(void *arg)
tor_free(dir); tor_free(dir);
teardown_capture_of_logs(); teardown_capture_of_logs();
} }
#endif /* !(defined(_WIN32) || defined (__ANDROID__)) */ #endif /* !defined(DISABLE_PWDB_TESTS) */
static void static void
test_util_calloc_check(void *arg) test_util_calloc_check(void *arg)