Commit 7301339e authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

fix wide lines from tor_log rename

parent 1dd03fbc

src/common/crypto.c

+2 −1
Changes for src/common/crypto.c: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ crypto_log_errors(int severity, const char *doing) 
      tor_log(severity, LD_CRYPTO, "crypto error while %s: %s (in %s:%s)",

              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);

    }

  }

}

src/or/circuitlist.c

+4 −4
Changes for src/or/circuitlist.c: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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);

src/or/relay.c

+2 −1
Changes for src/or/relay.c: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2023,7 +2023,8 @@ 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.",

  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);

}

src/or/router.c

+8 −8
Changes for src/or/router.c: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -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;
@@ -634,11 +634,11 @@ v3_authority_check_key_expiry(void) 
    tor_log(badness, LD_DIR, "Your v3 authority certificate has expired."

            " 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;

}

src/tools/tor-gencert.c

+2 −1
Changes for src/tools/tor-gencert.c: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ crypto_log_errors(int severity, const char *doing) 
      tor_log(severity, LD_CRYPTO, "crypto error while %s: %s (in %s:%s)",

              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);

    }

  }

}