aboutsummaryrefslogtreecommitdiff
path: root/src/or/rephist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-01 15:43:37 -0500
committerNick Mathewson <nickm@torproject.org>2013-02-01 15:43:37 -0500
commita141430ec3f344d4f021f614942ff5b769b8c900 (patch)
tree9ede2df8d618be4a055b6beacdff7b44c6aa836d /src/or/rephist.c
parentabb5519d93d56c2859e147fef2fbf0f9e96d5b9c (diff)
downloadtor-a141430ec3f344d4f021f614942ff5b769b8c900.tar.gz
tor-a141430ec3f344d4f021f614942ff5b769b8c900.zip
Rename log() to tor_log() for logging
This is meant to avoid conflict with the built-in log() function in math.h. It resolves ticket 7599. First reported by dhill. This was generated with the following perl script: #!/usr/bin/perl -w -i -p s/\blog\(LOG_(ERR|WARN|NOTICE|INFO|DEBUG)\s*,\s*/log_\L$1\(/g; s/\blog\(/tor_log\(/g;
Diffstat (limited to 'src/or/rephist.c')
-rw-r--r--src/or/rephist.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 74d459f8a3..925ca88153 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -648,7 +648,7 @@ rep_hist_dump_stats(time_t now, int severity)
rep_history_clean(now - get_options()->RephistTrackTime);
- log(severity, LD_HIST, "--------------- Dumping history information:");
+ tor_log(severity, LD_HIST, "--------------- Dumping history information:");
for (orhist_it = digestmap_iter_init(history_map);
!digestmap_iter_done(orhist_it);
@@ -673,7 +673,7 @@ rep_hist_dump_stats(time_t now, int severity)
} else {
uptime=1.0;
}
- log(severity, LD_HIST,
+ tor_log(severity, LD_HIST,
"OR %s [%s]: %ld/%ld good connections; uptime %ld/%ld sec (%.2f%%); "
"wmtbf %lu:%02lu:%02lu",
name1, hexdigest1,
@@ -707,7 +707,7 @@ rep_hist_dump_stats(time_t now, int severity)
else
len += ret;
}
- log(severity, LD_HIST, "%s", buffer);
+ tor_log(severity, LD_HIST, "%s", buffer);
}
}
}
@@ -2042,7 +2042,7 @@ note_crypto_pk_op(pk_op_t operation)
void
dump_pk_ops(int severity)
{
- log(severity, LD_HIST,
+ tor_log(severity, LD_HIST,
"PK operations: %lu directory objects signed, "
"%lu directory objects verified, "
"%lu routerdescs signed, "