ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-11 15:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some vararg bugs in logMessage() et al

Browse Source
This commit is contained in:
Andrew Bettison 2012-05-19 14:04:30 +09:30
parent 2f4d1eb720
commit 96916c053c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
log.c
View File

@ -30,6 +30,7 @@ void logMessage(int level, char *fmt, ...)
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
vlogMessage(level, fmt, ap); vlogMessage(level, fmt, ap);
va_end(ap);
} }
void vlogMessage(int level, char *fmt, va_list ap) void vlogMessage(int level, char *fmt, va_list ap)
@ -38,7 +39,7 @@ void vlogMessage(int level, char *fmt, va_list ap)
char buf[8192]; char buf[8192];
va_copy(ap2, ap); va_copy(ap2, ap);
vsnprintf(buf, sizeof buf, fmt, ap2); vsnprintf(buf, sizeof buf, fmt, ap2);
va_end(ap); va_end(ap2);
buf[sizeof buf - 1] = '\0'; buf[sizeof buf - 1] = '\0';
#ifdef ANDROID #ifdef ANDROID
int alevel = ANDROID_LOG_UNKNOWN; int alevel = ANDROID_LOG_UNKNOWN;
@ -67,6 +68,7 @@ int setReason(char *fmt, ...)
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
vlogMessage(LOG_LEVEL_ERROR, fmt, ap); vlogMessage(LOG_LEVEL_ERROR, fmt, ap);
va_end(ap);
return -1; return -1;
} }