From 0f0e14c6e3eae87dc911a9cbd47884abb14604da Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 17 Mar 2006 04:43:37 +0000
Subject: [PATCH] normalize whitespace.

svn:r6173
---
 src/common/compat.h      | 2 +-
 src/or/connection_edge.c | 6 ++++--
 src/or/router.c          | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/common/compat.h b/src/common/compat.h
index 08b3f76466..8e570cb269 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -74,7 +74,7 @@
 #define __func__ "???"
 #endif
 #endif /* ifndef MAVE_MACRO__func__ */
-#endif /* if(not windows) */
+#endif /* if not windows */
 
 /* ===== String compatibility */
 #ifdef MS_WINDOWS
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 6b8b014b44..c1ecb66969 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -718,9 +718,11 @@ client_dns_set_addressmap(const char *address, uint32_t val,
                           int ttl)
 {
   struct in_addr in;
-  char extendedaddress[MAX_SOCKS_ADDR_LEN+MAX_HEX_NICKNAME_LEN+10]; /* <address>.<hex or nickname>.exit\0  or just  <address>\0 */
+  /* <address>.<hex or nickname>.exit\0  or just  <address>\0 */
+  char extendedaddress[MAX_SOCKS_ADDR_LEN+MAX_HEX_NICKNAME_LEN+10];
+  /* 123.123.123.123.<hex or nickname>.exit\0   or just  123.123.123.123\0 */
+  char extendedval[INET_NTOA_BUF_LEN+MAX_HEX_NICKNAME_LEN+10];
   char valbuf[INET_NTOA_BUF_LEN];
-  char extendedval[INET_NTOA_BUF_LEN+MAX_HEX_NICKNAME_LEN+10]; /* 123.123.123.123.<hex or nickname>.exit\0   or just  123.123.123.123\0 */
 
   tor_assert(address); tor_assert(val);
 
diff --git a/src/or/router.c b/src/or/router.c
index 77ca80457d..0e26f4f067 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -244,7 +244,8 @@ init_keys(void)
   char keydir[512];
   char keydir2[512];
   char fingerprint[FINGERPRINT_LEN+1];
-  char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3]; /*nickname<space>fp\n\0 */
+  /*nickname<space>fp\n\0 */
+  char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3];
   char *cp;
   const char *mydesc, *datadir;
   crypto_pk_env_t *prkey;
@@ -1220,7 +1221,6 @@ is_legal_nickname_or_hexdigest(const char *s)
     return is_legal_hexdigest(s);
 }
 
-
 /** Return true iff <b>s</b> is a legally valid hex-encoded identity-key
  * digest. */
 int