[tor-commits] [tor/master] fix wide lines from tor_log rename

[nickm at torproject.org]

commit 7301339e33bd15af777958ed884fbeadc5c0b10f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 1 16:19:02 2013 -0500

    fix wide lines from tor_log rename
---
 src/common/crypto.c     |    5 +++--
 src/or/circuitlist.c    |    8 ++++----
 src/or/relay.c          |    5 +++--
 src/or/router.c         |   18 +++++++++---------
 src/tools/tor-gencert.c |    5 +++--
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 7cfe2a8..70bd452 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -152,9 +152,10 @@ crypto_log_errors(int severity, const char *doing)
     if (!func) func = "(null)";
     if (doing) {
       tor_log(severity, LD_CRYPTO, "crypto error while %s: %s (in %s:%s)",
-          doing, msg, lib, func);
+              doing, msg, lib, func);
     } else {
-      tor_log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)", msg, lib, func);
+      tor_log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)",
+              msg, lib, func);
     }
   }
 }
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 8a378c0..6987dc4 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -783,8 +783,8 @@ circuit_dump_conn_details(int severity,
                           int this_circid,
                           int other_circid)
 {
-  tor_log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d (other side %d), "
-      "state %d (%s), born %ld:",
+  tor_log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d "
+      "(other side %d), state %d (%s), born %ld:",
       conn_array_index, type, this_circid, other_circid, circ->state,
       circuit_state_to_string(circ->state),
       (long)circ->timestamp_began.tv_sec);
@@ -846,8 +846,8 @@ circuit_dump_chan_details(int severity,
                           int this_circid,
                           int other_circid)
 {
-  tor_log(severity, LD_CIRC, "Conn %p has %s circuit: circID %d (other side %d), "
-      "state %d (%s), born %ld:",
+  tor_log(severity, LD_CIRC, "Conn %p has %s circuit: circID %d "
+      "(other side %d), state %d (%s), born %ld:",
       chan, type, this_circid, other_circid, circ->state,
       circuit_state_to_string(circ->state),
       (long)circ->timestamp_began.tv_sec);
diff --git a/src/or/relay.c b/src/or/relay.c
index 66b3089..eef23a7 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2023,8 +2023,9 @@ dump_cell_pool_usage(int severity)
       n_cells += TO_OR_CIRCUIT(c)->p_chan_cells.n;
     ++n_circs;
   }
-  tor_log(severity, LD_MM, "%d cells allocated on %d circuits. %d cells leaked.",
-      n_cells, n_circs, total_cells_allocated - n_cells);
+  tor_log(severity, LD_MM,
+          "%d cells allocated on %d circuits. %d cells leaked.",
+          n_cells, n_circs, total_cells_allocated - n_cells);
   mp_pool_log_status(cell_pool, severity);
 }
 
diff --git a/src/or/router.c b/src/or/router.c
index 69d346f..db396f0 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -406,8 +406,8 @@ init_key_from_file(const char *fname, int generate, int severity)
           if (try_locking(get_options(), 0)<0) {
             /* Make sure that --list-fingerprint only creates new keys
              * if there is no possibility for a deadlock. */
-            tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". Not "
-                "writing any new keys.", fname);
+            tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". "
+                    "Not writing any new keys.", fname);
             /*XXXX The 'other process' might make a key in a second or two;
              * maybe we should wait for it. */
             goto error;
@@ -473,8 +473,8 @@ init_curve25519_keypair_from_file(curve25519_keypair_t *keys_out,
           if (try_locking(get_options(), 0)<0) {
             /* Make sure that --list-fingerprint only creates new keys
              * if there is no possibility for a deadlock. */
-            tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". Not "
-                "writing any new keys.", fname);
+            tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". "
+                    "Not writing any new keys.", fname);
             /*XXXX The 'other process' might make a key in a second or two;
              * maybe we should wait for it. */
             goto error;
@@ -632,13 +632,13 @@ v3_authority_check_key_expiry(void)
 
   if (time_left <= 0) {
     tor_log(badness, LD_DIR, "Your v3 authority certificate has expired."
-        " Generate a new one NOW.");
+            " Generate a new one NOW.");
   } else if (time_left <= 24*60*60) {
-    tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d hours;"
-        " Generate a new one NOW.", time_left/(60*60));
+    tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d "
+            "hours; Generate a new one NOW.", time_left/(60*60));
   } else {
-    tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d days;"
-        " Generate a new one soon.", time_left/(24*60*60));
+    tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d "
+            "days; Generate a new one soon.", time_left/(24*60*60));
   }
   last_warned = now;
 }
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index d2057ea..3809b22 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -83,9 +83,10 @@ crypto_log_errors(int severity, const char *doing)
     if (!func) func = "(null)";
     if (doing) {
       tor_log(severity, LD_CRYPTO, "crypto error while %s: %s (in %s:%s)",
-          doing, msg, lib, func);
+              doing, msg, lib, func);
     } else {
-      tor_log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)", msg, lib, func);
+      tor_log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)",
+              msg, lib, func);
     }
   }
 }