Fix a bunch of spaces.

svn:r6678

diff --git a/src/or/directory.c b/src/or/directory.c
index 47af8f150460c85656c45ee647c421536ecfedb7..fcee412173ce9ef7f714d58fd6cb7ef2ac909960 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1964,12 +1964,12 @@ dir_split_resource_into_fingerprints(const char *resource,
     for (i = 1; i < smartlist_len(fp_tmp); ++i) {
       char *cp = smartlist_get(fp_tmp, i);
       char *last = smartlist_get(fp_tmp2, smartlist_len(fp_tmp2)-1);
-      
+
       if ((decode_hex && memcmp(cp, last, DIGEST_LEN))
-         || (!decode_hex && strcasecmp(cp, last)))
-       smartlist_add(fp_tmp2, cp);
+          || (!decode_hex && strcasecmp(cp, last)))
+        smartlist_add(fp_tmp2, cp);
       else
-       tor_free(cp);
+        tor_free(cp);
     }
     smartlist_free(fp_tmp);
     fp_tmp = fp_tmp2;

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7af40e9cb650fad3a8550a32b17a79886cdca66b..b311bc6c1685244005394b5181ddd1c0fe9c8e8d 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1890,17 +1890,17 @@ connection_dirserv_add_networkstatus_bytes_to_outbuf(connection_t *conn)
       int uncompressing = (conn->zlib_state != NULL);
       int r = connection_dirserv_add_dir_bytes_to_outbuf(conn);
       if (conn->dir_spool_src == DIR_SPOOL_NONE) {
-       /* add_dir_bytes thinks we're done with the cached_dir.  But we
-        * may have more cached_dirs! */
-       conn->dir_spool_src = DIR_SPOOL_NETWORKSTATUS;
-       /* This bit is tricky.  If we were uncompressing the last
-        * networkstatus, we may need to make a new zlib object to
-        * uncompress the next one. */
-       if (uncompressing && ! conn->zlib_state &&
-           conn->fingerprint_stack &&
-           smartlist_len(conn->fingerprint_stack)) {
-         conn->zlib_state = tor_zlib_new(0, ZLIB_METHOD);
-       }
+        /* add_dir_bytes thinks we're done with the cached_dir.  But we
+         * may have more cached_dirs! */
+        conn->dir_spool_src = DIR_SPOOL_NETWORKSTATUS;
+        /* This bit is tricky.  If we were uncompressing the last
+         * networkstatus, we may need to make a new zlib object to
+         * uncompress the next one. */
+        if (uncompressing && ! conn->zlib_state &&
+            conn->fingerprint_stack &&
+            smartlist_len(conn->fingerprint_stack)) {
+          conn->zlib_state = tor_zlib_new(0, ZLIB_METHOD);
+        }
       }
       if (r) return r;
     } else if (conn->fingerprint_stack &&

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 3fbed2174201e97005b89b59c1e76f554ae3fcfc..009858054316bc88e47e491b39a7f4f8d20217e0 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -208,7 +208,6 @@ _compare_routers_by_age(const void **_a, const void **_b)
   return r1->cache_info.published_on - r2->cache_info.published_on;
 }
 
-
 /** If the journal is too long, or if <b>force</b> is true, then atomically
  * replace the router store with the routers currently in our routerlist, and
  * clear the journal.  Return 0 on success, -1 on failure.

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 7214055e015f60d4285b3374c01ed39d36f8c70f..b1dd2e30dc5dc474a3d1f0651cd9c269a9400c6c 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -682,7 +682,6 @@ router_parse_list_from_string(const char **s, smartlist_t *dest,
     router = router_parse_entry_from_string(*s, end,
                                             saved_location != SAVED_IN_CACHE);
 
-
     if (!router) {
       log_warn(LD_DIR, "Error reading router; skipping");
       *s = end;