Merge remote-tracking branch 'allan/ALPM'

Conflicts:
	lib/libalpm/be_local.c
	lib/libalpm/be_package.c
	lib/libalpm/conflict.c
	lib/libalpm/diskspace.c
	lib/libalpm/dload.c
	lib/libalpm/remove.c

3 files changed, 10 insertions, 10 deletions

diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c
index 70fb7607..08d8a557 100644
--- a/src/util/cleanupdelta.c
+++ b/src/util/cleanupdelta.c
@@ -43,9 +43,9 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args)
 {
 	if(strlen(fmt)) {
 		switch(level) {
-			case PM_LOG_ERROR: printf("error: "); break;
-			case PM_LOG_WARNING: printf("warning: "); break;
-			//case PM_LOG_DEBUG: printf("debug: "); break;
+			case ALPM_LOG_ERROR: printf("error: "); break;
+			case ALPM_LOG_WARNING: printf("warning: "); break;
+			//case ALPM_LOG_DEBUG: printf("debug: "); break;
 			default: return;
 		}
 		vprintf(fmt, args);
diff --git a/src/util/testdb.c b/src/util/testdb.c
index b8ab33ca..642890b6 100644
--- a/src/util/testdb.c
+++ b/src/util/testdb.c
@@ -45,8 +45,8 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args)
 {
 	if(strlen(fmt)) {
 		switch(level) {
-			case PM_LOG_ERROR: printf("error: "); break;
-			case PM_LOG_WARNING: printf("warning: "); break;
+			case ALPM_LOG_ERROR: printf("error: "); break;
+			case ALPM_LOG_WARNING: printf("warning: "); break;
 			default: return;
 		}
 		vprintf(fmt, args);
diff --git a/src/util/testpkg.c b/src/util/testpkg.c
index a745984d..03234ed5 100644
--- a/src/util/testpkg.c
+++ b/src/util/testpkg.c
@@ -30,8 +30,8 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args)
 		return;
 	}
 	switch(level) {
-		case PM_LOG_ERROR: printf("error: "); break;
-		case PM_LOG_WARNING: printf("warning: "); break;
+		case ALPM_LOG_ERROR: printf("error: "); break;
+		case ALPM_LOG_WARNING: printf("warning: "); break;
 		default: return; /* skip other messages */
 	}
 	vprintf(fmt, args);
@@ -62,11 +62,11 @@ int main(int argc, char *argv[])
 			|| pkg == NULL) {
 		err = alpm_errno(handle);
 		switch(err) {
-			case PM_ERR_PKG_OPEN:
+			case ALPM_ERR_PKG_OPEN:
 				printf("Cannot open the given file.\n");
 				break;
-			case PM_ERR_LIBARCHIVE:
-			case PM_ERR_PKG_INVALID:
+			case ALPM_ERR_LIBARCHIVE:
+			case ALPM_ERR_PKG_INVALID:
 				printf("Package is invalid.\n");
 				break;
 			default: