[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r9734: oops; remove spurious argument from _log_prefix. (in tor/trunk: . src/common)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r9734: oops; remove spurious argument from _log_prefix. (in tor/trunk: . src/common)
- From: nickm@xxxxxxxx
- Date: Sun, 4 Mar 2007 16:08:26 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Sun, 04 Mar 2007 16:08:36 -0500
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: nickm
Date: 2007-03-04 16:08:26 -0500 (Sun, 04 Mar 2007)
New Revision: 9734
Modified:
tor/trunk/
tor/trunk/src/common/log.c
Log:
r12076@catbus: nickm | 2007-03-04 15:41:04 -0500
oops; remove spurious argument from _log_prefix.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r12076] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/src/common/log.c
===================================================================
--- tor/trunk/src/common/log.c 2007-03-04 20:11:46 UTC (rev 9733)
+++ tor/trunk/src/common/log.c 2007-03-04 21:08:26 UTC (rev 9734)
@@ -96,7 +96,7 @@
* <b>buf_len</b> character buffer in <b>buf</b>.
*/
static INLINE size_t
-_log_prefix(char *buf, size_t buf_len, int severity, uint32_t domain)
+_log_prefix(char *buf, size_t buf_len, int severity)
{
time_t t;
struct timeval now;
@@ -144,7 +144,7 @@
/* We are resetting, but we aren't at the start of the file; no
* need to log again. */
return 0;
- n = _log_prefix(buf, sizeof(buf), LOG_NOTICE, LD_GENERAL);
+ n = _log_prefix(buf, sizeof(buf), LOG_NOTICE);
tor_snprintf(buf+n, sizeof(buf)-n,
"Tor %s opening %slog file.\n", VERSION, is_new?"new ":"");
if (fputs(buf, lf->file) == EOF ||
@@ -170,7 +170,7 @@
tor_assert(buf_len >= 2); /* prevent integer underflow */
buf_len -= 2; /* subtract 2 characters so we have room for \n\0 */
- n = _log_prefix(buf, buf_len, severity, domain);
+ n = _log_prefix(buf, buf_len, severity);
end_of_prefix = buf+n;
if (funcname && should_log_function_name(domain, severity)) {