Revert "Remove log_cb, add ALPM_EVENT_LOG instead"

Moving logging to the event callback caused warnings
under clang due to non-literal format strings and
silenced all log messages when --print was used.

This reverts commit cd793c5ab7689cc8cbc18277375b368060e5acfe.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>

Conflicts:
	lib/libalpm/alpm.h
	src/pacman/callback.c
Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c
index 190e2c70..4a67fc38 100644
--- a/src/util/cleanupdelta.c
+++ b/src/util/cleanupdelta.c
@@ -35,19 +35,17 @@ static void cleanup(int signum)
 	exit(signum);
 }
 
-static void output_cb(alpm_event_log_t *event)
+__attribute__((format(printf, 2, 0)))
+static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args)
 {
-	if(event->type != ALPM_EVENT_LOG) {
-		return;
-	}
-	if(strlen(event->fmt)) {
-		switch(event->level) {
+	if(strlen(fmt)) {
+		switch(level) {
 			case ALPM_LOG_ERROR: printf("error: "); break;
 			case ALPM_LOG_WARNING: printf("warning: "); break;
 			/* case ALPM_LOG_DEBUG: printf("debug: "); break; */
 			default: return;
 		}
-		vprintf(event->fmt, event->args);
+		vprintf(fmt, args);
 	}
 }
 
@@ -128,7 +126,7 @@ int main(int argc, char *argv[])
 	}
 
 	/* let us get log messages from libalpm */
-	alpm_option_set_eventcb(handle, (alpm_cb_event) output_cb);
+	alpm_option_set_logcb(handle, output_cb);
 
 	checkdbs(dbnames);
 	alpm_list_free(dbnames);