[or-cvs] r13095: minor cleanups (in tor/trunk/src: common or)

[arma at seul.org]

Author: arma
Date: 2008-01-10 12:54:24 -0500 (Thu, 10 Jan 2008)
New Revision: 13095

Modified:
   tor/trunk/src/common/tortls.c
   tor/trunk/src/or/control.c
   tor/trunk/src/or/networkstatus.c
   tor/trunk/src/or/routerparse.c
Log:
minor cleanups


Modified: tor/trunk/src/common/tortls.c
===================================================================
--- tor/trunk/src/common/tortls.c	2008-01-10 17:48:40 UTC (rev 13094)
+++ tor/trunk/src/common/tortls.c	2008-01-10 17:54:24 UTC (rev 13095)
@@ -553,8 +553,7 @@
   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;
   }

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2008-01-10 17:48:40 UTC (rev 13094)
+++ tor/trunk/src/or/control.c	2008-01-10 17:54:24 UTC (rev 13095)
@@ -688,8 +688,8 @@
     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;

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2008-01-10 17:48:40 UTC (rev 13094)
+++ tor/trunk/src/or/networkstatus.c	2008-01-10 17:54:24 UTC (rev 13095)
@@ -200,7 +200,8 @@
         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 @@
  */
 int
 networkstatus_set_current_consensus(const char *consensus, unsigned flags)
-
-
 {
   networkstatus_vote_t *c;
   int r, result = -1;

Modified: tor/trunk/src/or/routerparse.c
===================================================================
--- tor/trunk/src/or/routerparse.c	2008-01-10 17:48:40 UTC (rev 13094)
+++ tor/trunk/src/or/routerparse.c	2008-01-10 17:54:24 UTC (rev 13095)
@@ -2252,7 +2252,7 @@
       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;
     }