Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=a1a138b804f8d613c886a139f152ca03d5dd00f0
commit a1a138b804f8d613c886a139f152ca03d5dd00f0
Author: Michel Hermier <herm...@frugalware.org>
Date: Wed Oct 30 09:33:18 2013 +0100
libpacman: Add _pacman_vlogaction.
diff --git a/lib/libpacman/util/log.c b/lib/libpacman/util/log.c
index 81c3066..b837d9c 100644
--- a/lib/libpacman/util/log.c
+++ b/lib/libpacman/util/log.c
@@ -57,15 +57,23 @@ void _pacman_vlog(unsigned char flag, const char *format,
va_list ap)
}
}
-int _pacman_logaction(unsigned char usesyslog, FILE *f, char *fmt, ...)
+int _pacman_logaction(unsigned char usesyslog, FILE *f, const char *format,
...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ _pacman_vlogaction(usesyslog, f, format, ap);
+ va_end(ap);
+
+ return(0);
+}
+
+void _pacman_vlogaction(unsigned char usesyslog, FILE *f, const char *format,
va_list ap)
{
char msg[1024];
int smsg = sizeof(msg)-1;
- va_list args;
- va_start(args, fmt);
- vsnprintf(msg, smsg, fmt, args);
- va_end(args);
+ vsnprintf(msg, smsg, format, ap);
if(usesyslog) {
syslog(LOG_WARNING, "%s", msg);
@@ -84,9 +92,6 @@ int _pacman_logaction(unsigned char usesyslog, FILE *f, char
*fmt, ...)
_pacman_strtrim(msg));
fflush(f);
}
-
- return(0);
}
-
/* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libpacman/util/log.h b/lib/libpacman/util/log.h
index 3aaeb11..f52737f 100644
--- a/lib/libpacman/util/log.h
+++ b/lib/libpacman/util/log.h
@@ -32,7 +32,8 @@ extern unsigned char pm_logmask;
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, ...);
+int _pacman_logaction(unsigned char usesyslog, FILE *f, const char *format,
...);
+void _pacman_vlogaction(unsigned char usesyslog, FILE *f, const char *format,
va_list ap);
#endif /* _PACMAN_LOG_H */
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
