Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=110d4d7295fa22c4ce8f6a051f2233c909a3d518
commit 110d4d7295fa22c4ce8f6a051f2233c909a3d518 Author: Michel Hermier <[email protected]> Date: Wed Oct 30 09:25:17 2013 +0100 libpacman: Add _pacman_vlog. diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c index 4feee58..f17d640 100644 --- a/lib/libpacman/util.c +++ b/lib/libpacman/util.c @@ -36,7 +36,6 @@ #ifdef __sun__ #include <alloca.h> #endif -#include <stdarg.h> #include <string.h> #include <unistd.h> #include <errno.h> diff --git a/lib/libpacman/util/log.c b/lib/libpacman/util/log.c index d38137e..81c3066 100644 --- a/lib/libpacman/util/log.c +++ b/lib/libpacman/util/log.c @@ -21,7 +21,6 @@ #include "config.h" #include <stdio.h> -#include <stdarg.h> #include <syslog.h> #include <time.h> @@ -34,7 +33,16 @@ pacman_cb_log pm_logcb = NULL; unsigned char pm_logmask = 0; -void _pacman_log(unsigned char flag, const char *fmt, ...) +void _pacman_log(unsigned char flag, const char *format, ...) +{ + va_list ap; + + va_start(ap, format); + _pacman_vlog(flag, format, ap); + va_end(ap); +} + +void _pacman_vlog(unsigned char flag, const char *format, va_list ap) { if(pm_logcb == NULL) { return; @@ -42,12 +50,8 @@ void _pacman_log(unsigned char flag, const char *fmt, ...) if(flag & pm_logmask) { char str[LOG_STR_LEN]; - va_list args; - - va_start(args, fmt); - vsnprintf(str, LOG_STR_LEN, fmt, args); - va_end(args); + vsnprintf(str, LOG_STR_LEN, format, ap); pm_logcb(flag, str); pacman_logaction(str); } diff --git a/lib/libpacman/util/log.h b/lib/libpacman/util/log.h index 419cf1a..3aaeb11 100644 --- a/lib/libpacman/util/log.h +++ b/lib/libpacman/util/log.h @@ -23,12 +23,15 @@ #include "pacman.h" +#include <stdarg.h> + #define LOG_STR_LEN 256 extern pacman_cb_log pm_logcb; extern unsigned char pm_logmask; -void _pacman_log(unsigned char flag, const char *fmt, ...); +void _pacman_log(unsigned char flag, const char *format, ...); +void _pacman_vlog(unsigned char flag, const char *format, va_list ap); int _pacman_logaction(unsigned char usesyslog, FILE *f, char *fmt, ...); #endif /* _PACMAN_LOG_H */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
