diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-07-25 09:03:01 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-07-25 09:03:01 -0400 |
| commit | cfb15d513dfdd64119d5e2aca94a61256bc2e00e (patch) | |
| tree | a7606855688d4fc6021085cbaf4de573a7d4ce43 /src/test | |
| parent | 7082cc16841f29183187dfa369749942cf8f1564 (diff) | |
| parent | 2a4b156978c8f25c6c5850a393f27fcbfba5466a (diff) | |
| download | tor-cfb15d513dfdd64119d5e2aca94a61256bc2e00e.tar.gz tor-cfb15d513dfdd64119d5e2aca94a61256bc2e00e.zip | |
Merge branch 'maint-0.4.1'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_logging.c | 2 | ||||
| -rw-r--r-- | src/test/test_options.c | 4 | ||||
| -rw-r--r-- | src/test/testing_common.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test_logging.c b/src/test/test_logging.c index 6416e98a4e..bb7018fe1c 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -15,7 +15,7 @@ #endif static void -dummy_cb_fn(int severity, uint32_t domain, const char *msg) +dummy_cb_fn(int severity, log_domain_mask_t domain, const char *msg) { (void)severity; (void)domain; (void)msg; } diff --git a/src/test/test_options.c b/src/test/test_options.c index b39cd4f1e4..64fcd011e7 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -31,14 +31,14 @@ typedef struct { int severity; - uint32_t domain; + log_domain_mask_t domain; char *msg; } logmsg_t; static smartlist_t *messages = NULL; static void -log_cback(int severity, uint32_t domain, const char *msg) +log_cback(int severity, log_domain_mask_t domain, const char *msg) { logmsg_t *x = tor_malloc(sizeof(*x)); x->severity = severity; diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 1c2a2e8960..ad22898ce5 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -243,7 +243,7 @@ tinytest_postfork(void) } static void -log_callback_failure(int severity, uint32_t domain, const char *msg) +log_callback_failure(int severity, log_domain_mask_t domain, const char *msg) { (void)msg; if (severity == LOG_ERR || (domain & LD_BUG)) { |