diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-12-16 12:36:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-12-16 12:36:35 -0500 |
| commit | 5591a3bcd6f80ab301e8750930de1c7bca78387c (patch) | |
| tree | e29d334172e6f120f431fae523ad048699b9acbf | |
| parent | ecffdb0b1745d00988e525a5d3c6bde28e7fe22f (diff) | |
| parent | a86918d524806d34cbcac9c42fc7616ddc4a5fd1 (diff) | |
| download | tor-5591a3bcd6f80ab301e8750930de1c7bca78387c.tar.gz tor-5591a3bcd6f80ab301e8750930de1c7bca78387c.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/504'
| -rw-r--r-- | src/ext/ed25519/donna/test-ticks.h | 4 | ||||
| -rw-r--r-- | src/feature/client/entrynodes.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ext/ed25519/donna/test-ticks.h b/src/ext/ed25519/donna/test-ticks.h index 0103e03dde..16cec9ba92 100644 --- a/src/ext/ed25519/donna/test-ticks.h +++ b/src/ext/ed25519/donna/test-ticks.h @@ -13,7 +13,7 @@ get_ticks(void) { __asm__ __volatile__("rdtsc" : "=a" (lo), "=d" (hi)); return ((uint64_t)lo | ((uint64_t)hi << 32)); #else - need rdtsc for this compiler + #error need rdtsc for this compiler #endif #elif defined(OS_SOLARIS) return (uint64_t)gethrtime(); @@ -35,7 +35,7 @@ get_ticks(void) { t = ((uint64_t)t2.tv_usec << 32) | (uint64_t)t2.tv_sec; return t; #else - need ticks for this platform + #error need ticks for this platform #endif } diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 32ecb4f705..15f29d1c3e 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2743,7 +2743,7 @@ entry_guards_upgrade_waiting_circuits(guard_selection_t *gs, {NONPRIMARY_GUARD_CONNECT_TIMEOUT} seconds." */ circuit_guard_state_t *state = origin_circuit_get_guard_state(circ); - if BUG((state == NULL)) + if (BUG(state == NULL)) continue; if (state->state != GUARD_CIRC_STATE_COMPLETE) continue; |