aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-09-03 13:39:31 -0400
committerNick Mathewson <nickm@torproject.org>2013-09-03 13:39:31 -0400
commit5c9008e0b077e79297a5245573675d95a1f266cc (patch)
tree8615c2b113493991d00beb0e3e95951ecd751720
parent37534880113133716b220bf6d5ffaaf910072b30 (diff)
downloadtor-5c9008e0b077e79297a5245573675d95a1f266cc.tar
tor-5c9008e0b077e79297a5245573675d95a1f266cc.tar.gz
Fix some "ISO C90 forbids mixed declarations and code" warnings
-rw-r--r--src/or/directory.c2
-rw-r--r--src/test/test_dir.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 099df50d0..815e0abff 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1418,10 +1418,10 @@ parse_http_url(const char *headers, char **url)
/* Check if the header is well formed (next sequence
* should be HTTP/1.X\r\n). Assumes we're supporting 1.0? */
- char *e = (char *)eat_whitespace_no_nl(s);
{
unsigned minor_ver;
char ch;
+ char *e = (char *)eat_whitespace_no_nl(s);
if (2 != tor_sscanf(e, "HTTP/1.%u%c", &minor_ver, &ch)) {
return -1;
}
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 0292cbd66..94d1284f8 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -2367,8 +2367,8 @@ test_dir_fmt_control_ns(void *arg)
static void
test_dir_http_handling(void *args)
{
- (void)args;
char *url = NULL;
+ (void)args;
/* Parse http url tests: */
/* Good headers */