[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Fix a bunch of spaces.
Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv2818/src/or
Modified Files:
directory.c dirserv.c routerlist.c routerparse.c
Log Message:
Fix a bunch of spaces.
Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -p -d -r1.383 -r1.384
--- directory.c 22 Jun 2006 07:01:54 -0000 1.383
+++ directory.c 22 Jun 2006 07:25:15 -0000 1.384
@@ -1964,12 +1964,12 @@ dir_split_resource_into_fingerprints(con
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;
Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -p -d -r1.349 -r1.350
--- dirserv.c 22 Jun 2006 07:01:54 -0000 1.349
+++ dirserv.c 22 Jun 2006 07:25:15 -0000 1.350
@@ -1890,17 +1890,17 @@ connection_dirserv_add_networkstatus_byt
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 &&
Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -p -d -r1.523 -r1.524
--- routerlist.c 22 Jun 2006 07:10:37 -0000 1.523
+++ routerlist.c 22 Jun 2006 07:25:15 -0000 1.524
@@ -208,7 +208,6 @@ _compare_routers_by_age(const void **_a,
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.
Index: routerparse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerparse.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -d -r1.187 -r1.188
--- routerparse.c 22 Jun 2006 07:19:28 -0000 1.187
+++ routerparse.c 22 Jun 2006 07:25:15 -0000 1.188
@@ -682,7 +682,6 @@ router_parse_list_from_string(const char
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;