minor cleanups

svn:r13095

4 files changed, 6 insertions, 8 deletions

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 844969aa02..68e9baf33c 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -553,8 +553,7 @@ tor_tls_context_new(crypto_pk_env_t *identity, const char *nickname,
   if (idcert) {
     X509_STORE *s = SSL_CTX_get_cert_store(result->ctx);
     tor_assert(s);
-    X509_STORE_add_cert(s, idcert); /*XXXX020 This cert seems not to get
-                                     * freed.  Fix that! */
+    X509_STORE_add_cert(s, idcert);
     X509_free(idcert); /* The context now owns the reference to idcert */
     idcert = NULL;
   }
diff --git a/src/or/control.c b/src/or/control.c
index 985b82c430..9e28e06ffe 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -688,8 +688,8 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body,
     key = tor_strndup(body, eq-body);
     body = eq+1;
     if (*eq == '=') {
-      char *val;
-      size_t val_len;
+      char *val=NULL;
+      size_t val_len=0;
       size_t ent_len;
       if (*body != '\"') {
         char *val_start = body;
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index a3a16a9dfd..67e34a7786 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -200,7 +200,8 @@ router_reload_consensus_networkstatus(void)
         log_info(LD_FS, "Couldn't load consensus networkstatus from \"%s\"",
                  options->FallbackNetworkstatusFile);
       } else {
-        log_notice(LD_FS, "Loaded fallback consensus networkstaus from \"%s\"",
+        log_notice(LD_FS,
+                   "Loaded fallback consensus networkstatus from \"%s\"",
                    options->FallbackNetworkstatusFile);
       }
       tor_free(s);
@@ -1328,8 +1329,6 @@ networkstatus_copy_old_consensus_info(networkstatus_vote_t *new_c,
  */
 int
 networkstatus_set_current_consensus(const char *consensus, unsigned flags)
-
-
 {
   networkstatus_vote_t *c;
   int r, result = -1;
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 19fbf9fa4c..e57077d660 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2252,7 +2252,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
       goto err;
     }
     if (!(v = networkstatus_get_voter_by_id(ns, declared_identity))) {
-      log_warn(LD_DIR, "ID on signature on network-status vote does not match"
+      log_warn(LD_DIR, "ID on signature on network-status vote does not match "
                "any declared directory source.");
       goto err;
     }