--- a/src/log.c Fri May 08 01:42:44 2009 +0300
+++ b/src/log.c Fri May 08 01:43:02 2009 +0300
@@ -72,11 +72,7 @@
_log_output_ctx.arg = arg;
}
-/**
- * Format the full output line, and pass it to the log_output_func. The line will be of the form:
- * "[<level>] <func> : <log_fmt> [ <user_fmt> ]"
- */
-static void log_output (enum log_level level, const char *func, const char *user_fmt, va_list user_fmtargs, const char *log_fmt, ...)
+void log_output_tag (enum log_level level, const char *tag, const char *func, const char *user_fmt, va_list user_fmtargs, const char *log_fmt, ...)
{
char buf[LOG_MSG_MAX], *buf_ptr = buf;
size_t buf_size = sizeof(buf);
@@ -86,7 +82,7 @@
return;
// output the header
- buf_ptr += str_advance(NULL, &buf_size, str_append_fmt(buf_ptr, buf_size, "[%5s] %20s : ", log_level_name(level), func));
+ buf_ptr += str_advance(NULL, &buf_size, str_append_fmt(buf_ptr, buf_size, "[%5s] %20s : ", tag, func));
// output the user data
buf_ptr += str_advance(NULL, &buf_size, str_append_fmt_va(buf_ptr, buf_size, user_fmt, user_fmtargs));
@@ -110,7 +106,7 @@
// formatted output: no suffix
va_start(vargs, format);
- log_output(level, func, format, vargs, NULL);
+ log_output_tag(level, log_level_name(level), func, format, vargs, NULL);
va_end(vargs);
}
@@ -120,7 +116,7 @@
// formatted output: suffix error_name()
va_start(vargs, format);
- log_output(level, func, format, vargs, ": %s", error_name(err));
+ log_output_tag(level, log_level_name(level), func, format, vargs, ": %s", error_name(err));
va_end(vargs);
}
@@ -130,7 +126,7 @@
// formatted output: suffix error_msg()
va_start(vargs, format);
- log_output(level, func, format, vargs, ": %s", error_msg(err));
+ log_output_tag(level, log_level_name(level), func, format, vargs, ": %s", error_msg(err));
va_end(vargs);
}
@@ -140,7 +136,7 @@
// formatted output: suffix strerror()
va_start(vargs, format);
- log_output(level, func, format, vargs, ": %s", strerror(errno));
+ log_output_tag(level, log_level_name(level), func, format, vargs, ": %s", strerror(errno));
va_end(vargs);
}