diff options
| author | Olivier Brunel <jjk@jjacky.com> | 2014-01-10 16:25:15 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-03-03 02:25:54 +0100 |
| commit | cd793c5ab7689cc8cbc18277375b368060e5acfe (patch) | |
| tree | a910fef22528f58f2abb38f89a1df354f8f35d62 /src/util/testpkg.c | |
| parent | 28dbd5551ee75e843019e6f067ed069daaabba0b (diff) | |
| download | pacman-cd793c5ab7689cc8cbc18277375b368060e5acfe.tar.gz pacman-cd793c5ab7689cc8cbc18277375b368060e5acfe.tar.xz | |
Remove log_cb, add ALPM_EVENT_LOG instead
When ALPM emits a log message, it still goes through _alpm_log() but
instead of calling a specific log callback, it goes as an event.
Signed-off-by: Olivier Brunel <jjk@jjacky.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src/util/testpkg.c')
| -rw-r--r-- | src/util/testpkg.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/util/testpkg.c b/src/util/testpkg.c index cc7d9c2b..39807feb 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -23,18 +23,20 @@ #include <alpm.h> -__attribute__((format(printf, 2, 0))) -static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) +static void output_cb(alpm_event_log_t *event) { - if(fmt[0] == '\0') { + if(event->type != ALPM_EVENT_LOG) { return; } - switch(level) { + if(event->fmt[0] == '\0') { + return; + } + switch(event->level) { case ALPM_LOG_ERROR: printf("error: "); break; case ALPM_LOG_WARNING: printf("warning: "); break; default: return; /* skip other messages */ } - vprintf(fmt, args); + vprintf(event->fmt, event->args); } int main(int argc, char *argv[]) @@ -59,7 +61,7 @@ int main(int argc, char *argv[]) } /* let us get log messages from libalpm */ - alpm_option_set_logcb(handle, output_cb); + alpm_option_set_eventcb(handle, (alpm_cb_event) output_cb); /* set gpgdir to default */ alpm_option_set_gpgdir(handle, GPGDIR); |