shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

log: move original print_log code to _vprint_log and make print_log a wrapper over _vprint_log

Browse Source 
Move code from original print_log fn to a separate _vprint_log function
that accepts va_list and make print_log a wrapper over _vprint_log.
The print_log just initializes the va_list and uses it for _vprint_log
call now. This way, we can reuse _vprint_log if needed.
This commit is contained in:
Peter Rajnoha 2016-06-23 13:39:38 +02:00
parent 79eaaee50a
commit 6eeb66e51d
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/log/log.c
View File

@ -306,8 +306,9 @@ const char *log_get_report_object_type_name(log_report_object_type_t object_type
return log_object_type_names[object_type]; return log_object_type_names[object_type];
} }
void print_log(int level, const char *file, int line, int dm_errno_or_class, __attribute__ ((format(printf, 5, 0)))
const char *format, ...) static void _vprint_log(int level, const char *file, int line, int dm_errno_or_class,
const char *format, va_list orig_ap)
{ {
va_list ap; va_list ap;
char buf[1024], message[4096]; char buf[1024], message[4096];
@ -360,7 +361,7 @@ void print_log(int level, const char *file, int line, int dm_errno_or_class,
(_store_errmsg && (level <= _LOG_ERR)) || (_store_errmsg && (level <= _LOG_ERR)) ||
(_log_report.report && !log_bypass_report && (use_stderr || (level <=_LOG_WARN))) || (_log_report.report && !log_bypass_report && (use_stderr || (level <=_LOG_WARN))) ||
log_once) { log_once) {
va_start(ap, format); va_copy(ap, orig_ap);
n = vsnprintf(message, sizeof(message), trformat, ap); n = vsnprintf(message, sizeof(message), trformat, ap);
va_end(ap); va_end(ap);
@ -445,7 +446,7 @@ void print_log(int level, const char *file, int line, int dm_errno_or_class,
default: /* nothing to do */; default: /* nothing to do */;
} }
va_start(ap, format); va_copy(ap, orig_ap);
switch (level) { switch (level) {
case _LOG_DEBUG: case _LOG_DEBUG:
if (verbose_level() < _LOG_DEBUG) if (verbose_level() < _LOG_DEBUG)
@ -480,7 +481,7 @@ void print_log(int level, const char *file, int line, int dm_errno_or_class,
fprintf(_log_file, "%s:%d %s%s", file, line, log_command_name(), fprintf(_log_file, "%s:%d %s%s", file, line, log_command_name(),
_msg_prefix); _msg_prefix);
va_start(ap, format); va_copy(ap, orig_ap);
vfprintf(_log_file, trformat, ap); vfprintf(_log_file, trformat, ap);
va_end(ap); va_end(ap);
@ -489,7 +490,7 @@ void print_log(int level, const char *file, int line, int dm_errno_or_class,
} }
if (_syslog && (_log_while_suspended || !critical_section())) { if (_syslog && (_log_while_suspended || !critical_section())) {
va_start(ap, format); va_copy(ap, orig_ap);
vsyslog(level, trformat, ap); vsyslog(level, trformat, ap);
va_end(ap); va_end(ap);
} }
@ -509,7 +510,7 @@ void print_log(int level, const char *file, int line, int dm_errno_or_class,
bufused += n; /* n does not include '\0' */ bufused += n; /* n does not include '\0' */
va_start(ap, format); va_copy(ap, orig_ap);
n = vsnprintf(buf + bufused, sizeof(buf) - bufused, n = vsnprintf(buf + bufused, sizeof(buf) - bufused,
trformat, ap); trformat, ap);
va_end(ap); va_end(ap);
@ -529,6 +530,16 @@ void print_log(int level, const char *file, int line, int dm_errno_or_class,
} }
} }
void print_log(int level, const char *file, int line, int dm_errno_or_class,
const char *format, ...)
{
va_list ap;
va_start(ap, format);
_vprint_log(level, file, line, dm_errno_or_class, format, ap);
va_end(ap);
}
log_report_t log_get_report_state(void) log_report_t log_get_report_state(void)
{ {
return _log_report; return _log_report;