[tor-commits] [tor/master] Fix 'make check-spaces'

[nickm@xxxxxxxxxxxxxx]

commit 9b3f48c0744bd72cb8b25ac7857476181b29481a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jun 29 11:47:35 2011 -0400

    Fix 'make check-spaces'
---
 src/or/buffers.c |    2 +-
 src/test/test.c  |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 4b8532a..3490d6d 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1691,7 +1691,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
           req->socks_version = 5; /* remember we've already negotiated auth */
           log_debug(LD_APP,"socks5: accepted method 0 (no authentication)");
           r=0;
-        }else if (memchr(data+2, SOCKS_USER_PASS,nummethods)) {
+        } else if (memchr(data+2, SOCKS_USER_PASS,nummethods)) {
           req->reply[1] = SOCKS_USER_PASS; /* tell client to use "user/pass"
                                               auth method */
           req->socks_version = 5; /* remember we've already negotiated auth */
diff --git a/src/test/test.c b/src/test/test.c
index bac73f2..d0e24d1 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -210,7 +210,7 @@ test_buffers_socks4_unsupported_commands_helper(const char *cp, buf_t *buf,
   test_eq(4, socks->socks_version);
   test_eq(0, socks->replylen); /* XXX: shouldn't tor reply? */
 
-done:
+ done:
   ;
 }
 
@@ -248,7 +248,7 @@ test_buffers_socks4_supported_commands_helper(const char *cp, buf_t *buf,
   test_eq(0, socks->replylen); /* XXX: shouldn't tor reply? */
   test_streq("tor.org", socks->address);
 
-done:
+ done:
   ;
 }
 
@@ -279,7 +279,7 @@ test_buffers_socks5_unsupported_commands_helper(const char *cp, buf_t *buf,
   test_eq(0, socks->reply[1]); /* XXX: shouldn't tor reply 'command
                                   not supported' [07]? */
 
-done:
+ done:
   ;
 }
 
@@ -334,7 +334,7 @@ test_buffers_socks5_supported_commands_helper(const char *cp, buf_t *buf,
   test_eq(0, socks->reply[1]);
   test_streq("2.2.2.2", socks->address);
 
-done:
+ done:
   ;
 }
 
@@ -364,7 +364,7 @@ test_buffers_socks5_no_authenticate_helper(const char *cp, buf_t *buf,
   test_eq(5, socks->reply[0]);
   test_eq(0, socks->reply[1]);
 
-done:
+ done:
   ;
 }
 
@@ -394,7 +394,7 @@ test_buffers_socks5_authenticate_helper(const char *cp, buf_t *buf,
   test_eq(2, socks->replylen);
   test_eq(5, socks->reply[0]);
   test_eq(0, socks->reply[1]);
-done:
+ done:
   ;
 }
 
@@ -434,7 +434,7 @@ test_buffers_socks5_authenticate_with_data_helper(const char *cp, buf_t *buf,
   test_eq(0, socks->reply[1]);
   test_streq("2.2.2.2", socks->address);
   test_eq(4369, socks->port);
-done:
+ done:
   ;
 }
 
@@ -454,7 +454,7 @@ test_buffers_socks5_auth_before_negotiation_helper(const char *cp, buf_t *buf,
   test_eq(0, socks->reply[0]);
   test_eq(0, socks->reply[1]);
 
-done:
+ done:
   ;
 }
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits