aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-23 21:45:30 +00:00
Code

Fixed vargs strings in log

Browse Source
This commit is contained in:
James Booth 2012-09-09 16:23:33 +01:00
parent c07afbed99
commit 0f3c1e56d2
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/log.c
View File

@ -41,7 +41,10 @@ log_debug(const char * const msg, ...)
{ {
va_list arg; va_list arg;
va_start(arg, msg); va_start(arg, msg);
log_msg(PROF_LEVEL_DEBUG, PROF, msg, arg); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg);
log_msg(PROF_LEVEL_DEBUG, PROF, fmt_msg->str);
g_string_free(fmt_msg, TRUE);
va_end(arg); va_end(arg);
} }
@ -50,7 +53,10 @@ log_info(const char * const msg, ...)
{ {
va_list arg; va_list arg;
va_start(arg, msg); va_start(arg, msg);
log_msg(PROF_LEVEL_INFO, PROF, msg, arg); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg);
log_msg(PROF_LEVEL_INFO, PROF, fmt_msg->str);
g_string_free(fmt_msg, TRUE);
va_end(arg); va_end(arg);
} }
@ -59,7 +65,10 @@ log_warning(const char * const msg, ...)
{ {
va_list arg; va_list arg;
va_start(arg, msg); va_start(arg, msg);
log_msg(PROF_LEVEL_WARN, PROF, msg, arg); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg);
log_msg(PROF_LEVEL_WARN, PROF, fmt_msg->str);
g_string_free(fmt_msg, TRUE);
va_end(arg); va_end(arg);
} }
@ -68,7 +77,10 @@ log_error(const char * const msg, ...)
{ {
va_list arg; va_list arg;
va_start(arg, msg); va_start(arg, msg);
log_msg(PROF_LEVEL_ERROR, PROF, msg, arg); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg);
log_msg(PROF_LEVEL_ERROR, PROF, fmt_msg->str);
g_string_free(fmt_msg, TRUE);
va_end(arg); va_end(arg);
} }
@ -99,21 +111,14 @@ log_close(void)
} }
void void
log_msg(log_level_t level, const char * const area, const char * const msg, ...) log_msg(log_level_t level, const char * const area, const char * const msg)
{ {
if (level >= level_filter) { if (level >= level_filter) {
dt = g_date_time_new_now(tz); dt = g_date_time_new_now(tz);
va_list arg;
va_start(arg, msg);
GString *msg_formatted = g_string_new(NULL);
g_string_vprintf(msg_formatted, msg, arg);
va_end(arg);
gchar *date_fmt = g_date_time_format(dt, "%d/%m/%Y %H:%M:%S"); gchar *date_fmt = g_date_time_format(dt, "%d/%m/%Y %H:%M:%S");
fprintf(logp, "%s: %s: %s\n", date_fmt, area, msg_formatted->str); fprintf(logp, "%s: %s: %s\n", date_fmt, area, msg);
g_date_time_unref(dt); g_date_time_unref(dt);
g_string_free(msg_formatted, TRUE);
fflush(logp); fflush(logp);
} }

2
src/log.h
View File

@ -39,6 +39,6 @@ void log_info(const char * const msg, ...);
void log_warning(const char * const msg, ...); void log_warning(const char * const msg, ...);
void log_error(const char * const msg, ...); void log_error(const char * const msg, ...);
void log_msg(log_level_t level, const char * const area, void log_msg(log_level_t level, const char * const area,
const char * const msg, ...); const char * const msg);
#endif #endif