aboutsummaryrefslogtreecommitdiff
path: root/src/common/log.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-09-01 15:59:40 -0400
committerNick Mathewson <nickm@torproject.org>2009-09-01 15:59:40 -0400
commit1cda6f3e756c2e76d50d398726c5b1851556756f (patch)
tree6532b12c8f7cc40b7daecb810e49596c6f509647 /src/common/log.c
parentd76fd59a7ee49b36591708070d1e50d8a50c67d0 (diff)
parentbddda9bbdb047e52652f7c6f9c2047df15a4e08e (diff)
downloadtor-1cda6f3e756c2e76d50d398726c5b1851556756f.tar.gz
tor-1cda6f3e756c2e76d50d398726c5b1851556756f.zip
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/common/log.c')
-rw-r--r--src/common/log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/log.c b/src/common/log.c
index c25e98d5f8..09efa014c0 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -147,8 +147,8 @@ _log_prefix(char *buf, size_t buf_len, int severity)
t = (time_t)now.tv_sec;
n = strftime(buf, buf_len, "%b %d %H:%M:%S", tor_localtime_r(&t, &tm));
- r = tor_snprintf(buf+n, buf_len-n, ".%.3ld [%s] ",
- (long)now.tv_usec / 1000, sev_to_string(severity));
+ r = tor_snprintf(buf+n, buf_len-n, ".%.3i [%s] ",
+ (int)now.tv_usec / 1000, sev_to_string(severity));
if (r<0)
return buf_len-1;
else