* repo-add script - to add entries to a db file directly from package data (no PKGBUILD)

* libalpm api changes - move from a _getinfo(p, WHAT_WE_WANT) scheme to a
  typesafe _get_what_we_want(p) scheme [not 100% complete yet]
* some const correctness changes
* removal of PM_* types in alpm.h in favor of the pm*_t types used throughout
  libalpm

1 files changed, 4 insertions, 7 deletions

diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c
index f0dd2b18..2b543ae6 100644
--- a/lib/libalpm/log.c
+++ b/lib/libalpm/log.c
@@ -27,17 +27,14 @@
 #include "alpm.h"
 #include "log.h"
 
-/* Internal library log mechanism */
-alpm_cb_log pm_logcb     = NULL;
-unsigned char pm_logmask = 0;
-
 void _alpm_log(unsigned char flag, char *fmt, ...)
 {
-	if(pm_logcb == NULL) {
+	alpm_cb_log logcb = alpm_option_get_logcb();
+	if(logcb == NULL) {
 		return;
 	}
 
-	if(flag & pm_logmask) {
+	if(flag & alpm_option_get_logmask()) {
 		char str[LOG_STR_LEN];
 		va_list args;
 
@@ -45,7 +42,7 @@ void _alpm_log(unsigned char flag, char *fmt, ...)
 		vsnprintf(str, LOG_STR_LEN, fmt, args);
 		va_end(args);
 
-		pm_logcb(flag, str);
+		logcb(flag, str);
 	}
 }