aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-01-16 16:49:39 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-16 16:49:39 -0500
commite4821fa14de6d76219d4e5c1a320ba263bd5e46d (patch)
treee1729fadc32f5d4c6dec2da330f39be11d952429
parent2645de704be23e1a4a2f565f10e4c81c8db0c82a (diff)
downloadtor-e4821fa14de6d76219d4e5c1a320ba263bd5e46d.tar
tor-e4821fa14de6d76219d4e5c1a320ba263bd5e46d.tar.gz
Remove two extrneous semicolons in dirserv.c
In 6fbdf635 we added a couple of statements like: if (test) { ... }; The extraneous semicolons there get flagged as worrisome empty statements by the cparser library, so let's fix them. Patch by Christian Grothoff; fixes bug 7115.
-rw-r--r--changes/bug71154
-rw-r--r--src/or/dirserv.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug7115 b/changes/bug7115
new file mode 100644
index 000000000..976b9a9e8
--- /dev/null
+++ b/changes/bug7115
@@ -0,0 +1,4 @@
+ o Minor bugfixes (portability)
+ - Remove a couple of extraneous semicolos that were upsetting the
+ cparser library. Patch by Christian Grothoff. Fixes bug 7115;
+ bugfix on 0.2.2.1-alpha.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 2351386b3..8af848ca0 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2181,7 +2181,7 @@ routerstatus_format_entry(char *buf, size_t buf_len,
"(wanted descriptor %s).",
id, dd);
return -1;
- };
+ }
/* This assert can fire for the control port, because
* it can request NS documents before all descriptors
@@ -2205,7 +2205,7 @@ routerstatus_format_entry(char *buf, size_t buf_len,
tor_assert(tor_memeq(desc->cache_info.signed_descriptor_digest,
rs->descriptor_digest,
DIGEST_LEN));
- };
+ }
}
if (format == NS_CONTROL_PORT && rs->has_bandwidth) {