commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f
parent 621f8a304abf3d6d9c1083afe6ca571456cee38a
Author: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 May 2021 10:39:20 -0400
Reindent a few lines to fix a GCC warning.
As of GCC 11.1.1, the compiler warns us about code like this:
if (a)
b;
c;
and that's a good thing: we wouldn't want to "goto fail". But we
had an instance if this in circuituse.c, which was making our
compilation sad.
Fixes bug 40380; bugfix on 0.3.0.1-alpha.
Diffstat:
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/changes/bug40380 b/changes/bug40380
@@ -0,0 +1,3 @@
+ o Minor bugfixes (compiler warnings):
+ - Fix an indentation problem that led to a warning from GCC 11.1.1.
+ Fixes bug 40380; bugfix on 0.3.0.1-alpha.
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
@@ -1315,10 +1315,10 @@ circuit_predict_and_launch_new(void)
if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL)
flags |= CIRCLAUNCH_IS_INTERNAL;
- log_info(LD_CIRC,
- "Have %d clean circs need another buildtime test circ.", num);
- circuit_launch(CIRCUIT_PURPOSE_C_GENERAL, flags);
- return;
+ log_info(LD_CIRC,
+ "Have %d clean circs need another buildtime test circ.", num);
+ circuit_launch(CIRCUIT_PURPOSE_C_GENERAL, flags);
+ return;
}
}