summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-07-16 11:10:14 -0400
committerNick Mathewson <nickm@torproject.org>2015-07-16 11:10:14 -0400
commitb5cfcb2045262a3ce9485c4d5a0c91b89174e539 (patch)
tree9c4fb362b6b08f4acb5377e5fc4dd5ac53acf4d5 /src/or
parent8cb50703761affb496f2035768e0f024d9263938 (diff)
downloadtor-b5cfcb2045262a3ce9485c4d5a0c91b89174e539.tar.gz
tor-b5cfcb2045262a3ce9485c4d5a0c91b89174e539.zip
Fix most check-spaces issues
Diffstat (limited to 'src/or')
-rw-r--r--src/or/config.c1
-rw-r--r--src/or/rendcache.c11
-rw-r--r--src/or/rendcache.h1
-rw-r--r--src/or/routerkeys.c1
-rw-r--r--src/or/routerparse.c1
5 files changed, 7 insertions, 8 deletions
diff --git a/src/or/config.c b/src/or/config.c
index bd74db6097..2f656647e7 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2591,7 +2591,6 @@ options_validate_cb(void *old_options, void *options, void *default_options,
STMT_BEGIN log_warn(LD_CONFIG, args, ##__VA_ARGS__); STMT_END
#endif
-
/** Log a warning message iff <b>filepath</b> is not absolute.
* Warning message must contain option name <b>option</b> and
* an absolute path that <b>filepath<b> will resolve to.
diff --git a/src/or/rendcache.c b/src/or/rendcache.c
index 37d3f12f9d..be94ef4445 100644
--- a/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@ -237,7 +237,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e)
*e = entry;
}
-end:
+ end:
return ret;
}
@@ -374,9 +374,9 @@ rend_cache_store_v2_desc_as_dir(const char *desc)
number_stored++;
goto advance;
-skip:
+ skip:
rend_service_descriptor_free(parsed);
-advance:
+ advance:
/* advance to next descriptor, if available. */
current_desc = next_desc;
/* check if there is a next descriptor. */
@@ -566,14 +566,15 @@ rend_cache_store_v2_desc_as_client(const char *desc,
}
return RCS_OKAY;
-okay:
+ okay:
if (entry) {
*entry = e;
}
retval = RCS_OKAY;
-err:
+ err:
rend_service_descriptor_free(parsed);
tor_free(intro_content);
return retval;
}
+
diff --git a/src/or/rendcache.h b/src/or/rendcache.h
index f34f599e63..f33ea662f5 100644
--- a/src/or/rendcache.h
+++ b/src/or/rendcache.h
@@ -54,3 +54,4 @@ rend_cache_store_status_t rend_cache_store_v2_desc_as_client(const char *desc,
size_t rend_cache_get_total_allocation(void);
#endif /* TOR_RENDCACHE_H */
+
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index 955cb9ce23..47a6c89534 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -61,7 +61,6 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
* it right. */
}
-
if (secret_len != ED25519_SECKEY_LEN) {
log_err(LD_OR, "%s is corrupted.", fname);
saved_errno = EINVAL;
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 3904671d01..c2206f1075 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -4498,7 +4498,6 @@ microdescs_parse_from_string(const char *s, const char *eos,
}
}
-
if (tokenize_string(area, s, start_of_next_microdesc, tokens,
microdesc_token_table, flags)) {
log_warn(LD_DIR, "Unparseable microdescriptor");