Commit 444233c1 authored by Nick Mathewson's avatar Nick Mathewson 📖
Browse files

Run "make autostyle" in advance of new series.

parent b5d08ddc
Pipeline #3819 passed with stage
in 16 minutes and 48 seconds
......@@ -4958,9 +4958,9 @@ options_init_logs(const or_options_t *old_options, const or_options_t *options,
if (!validate_only) {
add_syslog_log(severity, options->SyslogIdentityTag);
}
#else
#else /* !defined(HAVE_SYSLOG_H) */
log_warn(LD_CONFIG, "The android logging API is no longer supported.");
#endif
#endif /* defined(HAVE_SYSLOG_H) */
goto cleanup;
}
}
......
......@@ -852,4 +852,4 @@ resolve_addr_reset_suggested(int family)
tor_addr_make_unspec(&last_suggested_addrs[af_to_idx(family)]);
}
#endif /* TOR_UNIT_TESTS */
#endif /* defined(TOR_UNIT_TESTS) */
......@@ -61,7 +61,7 @@ void resolve_addr_reset_suggested(int family);
#endif /* TOR_UNIT_TESTS */
#endif /* RESOLVE_ADDR_PRIVATE */
#endif /* defined(RESOLVE_ADDR_PRIVATE) */
#endif /* TOR_CONFIG_RESOLVE_ADDR_H */
#endif /* !defined(TOR_CONFIG_RESOLVE_ADDR_H) */
......@@ -309,7 +309,7 @@ process_win32_console_ctrl(DWORD ctrl_type)
activate_signal(SIGINT);
return TRUE;
}
#endif
#endif /* defined(_WIN32) */
/**
* Write current memory usage information to the log.
......@@ -514,7 +514,7 @@ handle_signals(void)
* to handle control signals like Ctrl+C in the console, we can use this to
* simulate the SIGINT signal */
if (enabled) SetConsoleCtrlHandler(process_win32_console_ctrl, TRUE);
#endif
#endif /* defined(_WIN32) */
}
/* Cause the signal handler for signal_num to be called in the event loop. */
......
......@@ -14,4 +14,4 @@
extern const char risky_option_list[];
#endif
#endif /* !defined(TOR_RISKY_OPTIONS_H) */
......@@ -72,7 +72,7 @@
#include "core/or/or_handshake_state_st.h"
#include "feature/nodelist/routerinfo_st.h"
#include "core/or/var_cell_st.h"
#include "src/feature/relay/relay_find_addr.h"
#include "feature/relay/relay_find_addr.h"
#include "lib/tls/tortls.h"
#include "lib/tls/x509.h"
......
......@@ -445,7 +445,7 @@ trailing_zeros(uint64_t x)
x>>=1;
}
return i;
#endif
#endif /* defined(__GNUC__) */
}
/**
......
......@@ -25,6 +25,6 @@
#define TRACEPOINT_DEFINE
#define TRACEPOINT_CREATE_PROBES
#include "trace_probes_circuit.h"
#include "core/or/trace_probes_circuit.h"
#endif /* USE_TRACING_INSTRUMENTATION_LTTNG */
#endif /* defined(USE_TRACING_INSTRUMENTATION_LTTNG) */
......@@ -19,4 +19,4 @@
#endif /* USE_TRACING_INSTRUMENTATION_LTTNG */
#endif /* TOR_TRACE_PROBES_CIRCUIT_H */
#endif /* !defined(TOR_TRACE_PROBES_CIRCUIT_H) */
......@@ -52,7 +52,7 @@
#include "feature/nodelist/node_st.h"
#include "feature/nodelist/routerinfo_st.h"
#include "src/app/config/statefile.h"
#include "app/config/statefile.h"
static int control_setconf_helper(control_connection_t *conn,
const control_cmd_args_t *args,
......
......@@ -183,9 +183,9 @@ static HT_HEAD(cdm_diff_ht, cdm_diff_t) cdm_diff_ht = HT_INITIALIZER();
// diff manager becomes larger than 64. To see if the issue goes away, we
// hardcode this value to 64 now while we investigate a better solution.
# define CACHE_MAX_NUM 64
#else
#else /* !defined(_WIN32) */
# define CACHE_MAX_NUM 128
#endif
#endif /* defined(_WIN32) */
/**
* Configuration for this module
......
......@@ -46,6 +46,6 @@ typedef struct hs_metrics_entry_t {
extern const hs_metrics_entry_t base_metrics[];
extern const size_t base_metrics_size;
#endif /* HS_METRICS_ENTRY_PRIVATE */
#endif /* defined(HS_METRICS_ENTRY_PRIVATE) */
#endif /* !defined(TOR_FEATURE_HS_METRICS_ENTRY_H) */
......@@ -93,7 +93,7 @@ STATIC int have_enough_mem_for_dircache(const struct or_options_t *options,
struct port_cfg_t;
STATIC const char *describe_relay_port(const struct port_cfg_t *port);
#endif /* TOR_UNIT_TESTS */
#endif /* defined(TOR_UNIT_TESTS) */
#endif /* defined(RELAY_CONFIG_PRIVATE) */
......
......@@ -28,5 +28,5 @@ void relay_addr_learn_from_dirauth(void);
#endif /* RELAY_FIND_ADDR_PRIVATE */
#endif /* TOR_RELAY_FIND_ADDR_H */
#endif /* !defined(TOR_RELAY_FIND_ADDR_H) */
......@@ -38,7 +38,7 @@ STATIC void add_obs(bw_array_t *b, time_t when, uint64_t n);
STATIC void bw_array_free_(bw_array_t *b);
STATIC size_t bwhist_fill_bandwidth_history(char *buf, size_t len,
const bw_array_t *b);
#endif /* defined(REPHIST_PRIVATE) */
#endif /* defined(BWHIST_PRIVATE) */
#ifdef TOR_UNIT_TESTS
extern struct bw_array_t *write_array;
......
......@@ -145,6 +145,6 @@ struct hs_v2_stats_t;
const struct hs_v2_stats_t *rep_hist_get_hs_v2_stats(void);
struct hs_v3_stats_t;
const struct hs_v3_stats_t *rep_hist_get_hs_v3_stats(void);
#endif
#endif /* defined(TOR_UNIT_TESTS) */
#endif /* !defined(TOR_REPHIST_H) */
......@@ -106,7 +106,7 @@ crypto_openssl_get_version_str(void)
#else
/* This old name was changed around OpenSSL 1.1.0 */
const int query = SSLEAY_VERSION;
#endif
#endif /* defined(OPENSSL_VERSION) */
if (crypto_openssl_version_str == NULL) {
const char *raw_version = OpenSSL_version(query);
......
......@@ -571,7 +571,7 @@ wrap_closedir(void *arg)
{
closedir(arg);
}
#endif /* defined(HAVE_GLOB) */
#endif /* defined(_WIN32) || ... */
/** Return a new list containing the paths that match the pattern
* <b>pattern</b>. Return NULL on error. On POSIX systems, errno is set by the
......@@ -636,7 +636,7 @@ tor_glob(const char *pattern)
#else
(void)pattern;
return result;
#endif /* !defined(HAVE_GLOB) */
#endif /* defined(_WIN32) || ... */
return result;
}
......
......@@ -258,7 +258,7 @@
abort()
#else
#define FALLTHROUGH_UNLESS_ALL_BUGS_ARE_FATAL FALLTHROUGH
#endif
#endif /* defined(ALL_BUGS_ARE_FATAL) */
/** In older code, we used tor_fragile_assert() to mark optional failure
* points. At these points, we could make some debug builds fail.
......
......@@ -40,7 +40,7 @@ struct metrics_store_entry_t {
} u;
};
#endif /* METRICS_STORE_ENTRY_PRIVATE */
#endif /* defined(METRICS_STORE_ENTRY_PRIVATE) */
typedef struct metrics_store_entry_t metrics_store_entry_t;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment