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>

1 files changed, 18 insertions, 18 deletions

diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 218772d5..cd77a312 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -270,6 +270,24 @@ void cb_event(alpm_event_t *event)
 					((alpm_event_database_missing_t *) event)->dbname);
 			}
 			break;
+		case ALPM_EVENT_LOG:
+			{
+				alpm_event_log_t *e = (alpm_event_log_t *) event;
+				if(!e->fmt || strlen(e->fmt) == 0) {
+					break;
+				}
+
+				if(on_progress) {
+					char *string = NULL;
+					pm_vasprintf(&string, e->level, e->fmt, e->args);
+					if(string != NULL) {
+						output = alpm_list_add(output, string);
+					}
+				} else {
+					pm_vfprintf(stderr, e->level, e->fmt, e->args);
+				}
+			}
+			break;
 		/* all the simple done events, with fallthrough for each */
 		case ALPM_EVENT_FILECONFLICTS_DONE:
 		case ALPM_EVENT_CHECKDEPS_DONE:
@@ -777,22 +795,4 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 	return;
 }
 
-/* Callback to handle notifications from the library */
-void cb_log(alpm_loglevel_t level, const char *fmt, va_list args)
-{
-	if(!fmt || strlen(fmt) == 0) {
-		return;
-	}
-
-	if(on_progress) {
-		char *string = NULL;
-		pm_vasprintf(&string, level, fmt, args);
-		if(string != NULL) {
-			output = alpm_list_add(output, string);
-		}
-	} else {
-		pm_vfprintf(stderr, level, fmt, args);
-	}
-}
-
 /* vim: set noet: */