aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2021-05-07 10:39:20 -0400
committerNick Mathewson <nickm@torproject.org>2021-05-07 10:39:20 -0400
commite2c1ac214c0ae77282709b50fb9fbdde50dd7a1f (patch)
treeaed2a8f763fd3a746a767483c3149fcfd0064b19
parent621f8a304abf3d6d9c1083afe6ca571456cee38a (diff)
downloadtor-e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f.tar.gz
tor-e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f.zip
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.
-rw-r--r--changes/bug403803
-rw-r--r--src/core/or/circuituse.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/changes/bug40380 b/changes/bug40380
new file mode 100644
index 0000000000..24d2876b7d
--- /dev/null
+++ 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
index 7273be3510..efd69fb4a3 100644
--- 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;
}
}