ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-20 21:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge fail

Browse Source 
Merge 4e3c93e failed: it should contain log.c from a1a296f, not a mix
between both varargs fix implementations (the other is f88dff0).

The resulting merge fails tests (on 64 bits architecture), while both
parents pass.
This commit is contained in:
Romain Vimont (®om) 2013-06-07 13:38:01 +02:00
parent 4e3c93e00a
commit cdee6aa737
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
log.c
View File

@ -389,9 +389,8 @@ static int _log_iterator_next(_log_iterator *it, int level)
return 0; return 0;
} }
static void _log_iterator_printf_nl(_log_iterator *it, int level, struct __sourceloc whence, const char *fmt, ...) static void _log_iterator_vprintf_nl(_log_iterator *it, int level, struct __sourceloc whence, const char *fmt, va_list ap)
{ {
va_list ap;
_log_iterator_rewind(it); _log_iterator_rewind(it);
while (_log_iterator_next(it, level)) { while (_log_iterator_next(it, level)) {
_log_prefix_whence(it, whence); _log_prefix_whence(it, whence);
@ -402,17 +401,27 @@ static void _log_iterator_printf_nl(_log_iterator *it, int level, struct __sourc
} }
} }
static void _log_iterator_printf_nl(_log_iterator *it, int level, struct __sourceloc whence, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
_log_iterator_vprintf_nl(it, level, whence, fmt, ap);
va_end(ap);
}
static void _logs_vprintf_nl(int level, struct __sourceloc whence, const char *fmt, va_list ap)
{
_log_iterator it;
_log_iterator_start(&it);
_log_iterator_vprintf_nl(&it, level, whence, fmt, ap);
}
static void _logs_printf_nl(int level, struct __sourceloc whence, const char *fmt, ...) static void _logs_printf_nl(int level, struct __sourceloc whence, const char *fmt, ...)
{ {
va_list ap; va_list ap;
_log_iterator it; va_start(ap, fmt);
_log_iterator_start(&it); _logs_vprintf_nl(level, whence, fmt, ap);
while (_log_iterator_next(&it, level)) { va_end(ap);
_log_prefix_whence(&it, whence);
va_start(ap, fmt);
vxprintf(it.xpf, fmt, ap);
va_end(ap);
}
} }
const char *log_file_directory_path() const char *log_file_directory_path()
@ -675,7 +684,16 @@ void logString(int level, struct __sourceloc whence, const char *str)
void logMessage(int level, struct __sourceloc whence, const char *fmt, ...) void logMessage(int level, struct __sourceloc whence, const char *fmt, ...)
{ {
va_list ap; if (level != LOG_LEVEL_SILENT) {
va_list ap;
va_start(ap, fmt);
vlogMessage(level, whence, fmt, ap);
va_end(ap);
}
}
void vlogMessage(int level, struct __sourceloc whence, const char *fmt, va_list ap)
{
if (level != LOG_LEVEL_SILENT) { if (level != LOG_LEVEL_SILENT) {
_log_iterator it; _log_iterator it;
_log_iterator_start(&it); _log_iterator_start(&it);