nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bunch of spaces.

Browse Source 
svn:r6678
This commit is contained in:
Nick Mathewson 2006-06-22 07:25:15 +00:00
parent 89a1453776
commit 52b8dfa95a
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/directory.c
View File

@ -1964,12 +1964,12 @@ dir_split_resource_into_fingerprints(const char *resource,
for (i = 1; i < smartlist_len(fp_tmp); ++i) { for (i = 1; i < smartlist_len(fp_tmp); ++i) {
char *cp = smartlist_get(fp_tmp, i); char *cp = smartlist_get(fp_tmp, i);
char *last = smartlist_get(fp_tmp2, smartlist_len(fp_tmp2)-1); char *last = smartlist_get(fp_tmp2, smartlist_len(fp_tmp2)-1);
if ((decode_hex && memcmp(cp, last, DIGEST_LEN)) if ((decode_hex && memcmp(cp, last, DIGEST_LEN))
|| (!decode_hex && strcasecmp(cp, last))) || (!decode_hex && strcasecmp(cp, last)))
smartlist_add(fp_tmp2, cp); smartlist_add(fp_tmp2, cp);
else else
tor_free(cp); tor_free(cp);
} }
smartlist_free(fp_tmp); smartlist_free(fp_tmp);
fp_tmp = fp_tmp2; fp_tmp = fp_tmp2;

22
src/or/dirserv.c
View File

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

1
src/or/routerlist.c
View File

@ -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; 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 /** 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 * replace the router store with the routers currently in our routerlist, and
* clear the journal. Return 0 on success, -1 on failure. * clear the journal. Return 0 on success, -1 on failure.

1
src/or/routerparse.c
View File

@ -682,7 +682,6 @@ router_parse_list_from_string(const char **s, smartlist_t *dest,
router = router_parse_entry_from_string(*s, end, router = router_parse_entry_from_string(*s, end,
saved_location != SAVED_IN_CACHE); saved_location != SAVED_IN_CACHE);
if (!router) { if (!router) {
log_warn(LD_DIR, "Error reading router; skipping"); log_warn(LD_DIR, "Error reading router; skipping");
*s = end; *s = end;