Prefix alpm_transprog_t members with ALPM

Signed-off-by: Allan McRae <allan@archlinux.org>

7 files changed, 28 insertions, 28 deletions

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 2a8f3862..a0e5f1db 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -565,10 +565,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 
 		/* call PROGRESS once with 0 percent, as we sort-of skip that here */
 		if(is_upgrade) {
-			PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START,
+			PROGRESS(trans, ALPM_TRANS_PROGRESS_UPGRADE_START,
 					alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current);
 		} else {
-			PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START,
+			PROGRESS(trans, ALPM_TRANS_PROGRESS_ADD_START,
 					alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current);
 		}
 
@@ -592,11 +592,11 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 			}
 
 			if(is_upgrade) {
-				PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START,
+				PROGRESS(trans, ALPM_TRANS_PROGRESS_UPGRADE_START,
 						alpm_pkg_get_name(newpkg), percent, pkg_count,
 						pkg_current);
 			} else {
-				PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START,
+				PROGRESS(trans, ALPM_TRANS_PROGRESS_ADD_START,
 						alpm_pkg_get_name(newpkg), percent, pkg_count,
 						pkg_current);
 			}
@@ -649,10 +649,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 	}
 
 	if(is_upgrade) {
-		PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START,
+		PROGRESS(trans, ALPM_TRANS_PROGRESS_UPGRADE_START,
 				alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current);
 	} else {
-		PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START,
+		PROGRESS(trans, ALPM_TRANS_PROGRESS_ADD_START,
 				alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current);
 	}
 
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index c9b2c850..b891e453 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -860,12 +860,12 @@ typedef enum _alpm_transconv_t {
 
 /** Transaction Progress */
 typedef enum _alpm_transprog_t {
-	PM_TRANS_PROGRESS_ADD_START,
-	PM_TRANS_PROGRESS_UPGRADE_START,
-	PM_TRANS_PROGRESS_REMOVE_START,
-	PM_TRANS_PROGRESS_CONFLICTS_START,
-	PM_TRANS_PROGRESS_DISKSPACE_START,
-	PM_TRANS_PROGRESS_INTEGRITY_START,
+	ALPM_TRANS_PROGRESS_ADD_START,
+	ALPM_TRANS_PROGRESS_UPGRADE_START,
+	ALPM_TRANS_PROGRESS_REMOVE_START,
+	ALPM_TRANS_PROGRESS_CONFLICTS_START,
+	ALPM_TRANS_PROGRESS_DISKSPACE_START,
+	ALPM_TRANS_PROGRESS_INTEGRITY_START,
 } alpm_transprog_t;
 
 /** Transaction Event callback */
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index 7324e34e..af1bce15 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -389,7 +389,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 		}
 
 		int percent = (current * 100) / numtargs;
-		PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", percent,
+		PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", percent,
 		         numtargs, current);
 		/* CHECK 1: check every target against every target */
 		_alpm_log(handle, ALPM_LOG_DEBUG, "searching for file conflicts: %s\n",
@@ -550,7 +550,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 			FREELIST(tmpfiles);
 		}
 	}
-	PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", 100,
+	PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", 100,
 			numtargs, current);
 
 	return conflicts;
diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c
index f0e22a68..0ce4332d 100644
--- a/lib/libalpm/diskspace.c
+++ b/lib/libalpm/diskspace.c
@@ -285,7 +285,7 @@ int _alpm_check_diskspace(alpm_handle_t *handle)
 		for(targ = trans->remove; targ; targ = targ->next, current++) {
 			alpm_pkg_t *local_pkg;
 			int percent = (current * 100) / numtargs;
-			PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
+			PROGRESS(trans, ALPM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
 					numtargs, current);
 
 			local_pkg = targ->data;
@@ -296,7 +296,7 @@ int _alpm_check_diskspace(alpm_handle_t *handle)
 	for(targ = trans->add; targ; targ = targ->next, current++) {
 		alpm_pkg_t *pkg, *local_pkg;
 		int percent = (current * 100) / numtargs;
-		PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
+		PROGRESS(trans, ALPM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
 				numtargs, current);
 
 		pkg = targ->data;
@@ -315,7 +315,7 @@ int _alpm_check_diskspace(alpm_handle_t *handle)
 		}
 	}
 
-	PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", 100,
+	PROGRESS(trans, ALPM_TRANS_PROGRESS_DISKSPACE_START, "", 100,
 			numtargs, current);
 
 	for(i = mount_points; i; i = alpm_list_next(i)) {
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index ec8ba119..a90cd13a 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -405,7 +405,7 @@ int _alpm_remove_packages(alpm_handle_t *handle)
 			_alpm_log(handle, ALPM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum);
 
 			/* init progress bar */
-			PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, 0,
+			PROGRESS(trans, ALPM_TRANS_PROGRESS_REMOVE_START, info->name, 0,
 					pkg_count, (pkg_count - targcount + 1));
 
 			/* iterate through the list backwards, unlinking files */
@@ -416,7 +416,7 @@ int _alpm_remove_packages(alpm_handle_t *handle)
 
 				/* update progress bar after each file */
 				percent = (position * 100) / filenum;
-				PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name,
+				PROGRESS(trans, ALPM_TRANS_PROGRESS_REMOVE_START, info->name,
 						percent, pkg_count, (pkg_count - targcount + 1));
 				position++;
 			}
@@ -424,7 +424,7 @@ int _alpm_remove_packages(alpm_handle_t *handle)
 		}
 
 		/* set progress to 100% after we finish unlinking files */
-		PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100,
+		PROGRESS(trans, ALPM_TRANS_PROGRESS_REMOVE_START, pkgname, 100,
 		         pkg_count, (pkg_count - targcount + 1));
 
 		/* run the post-remove script if it exists  */
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index f179f8e7..1537347e 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -865,7 +865,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
 		char *filepath;
 		pgp_verify_t check_sig;
 
-		PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", percent,
+		PROGRESS(trans, ALPM_TRANS_PROGRESS_INTEGRITY_START, "", percent,
 				numtargs, current);
 		if(spkg->origin == PKG_FROM_FILE) {
 			continue; /* pkg_load() has been already called, this package is valid */
@@ -895,7 +895,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
 		_alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */
 	}
 
-	PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", 100,
+	PROGRESS(trans, ALPM_TRANS_PROGRESS_INTEGRITY_START, "", 100,
 			numtargs, current);
 	EVENT(trans, ALPM_TRANS_EVT_INTEGRITY_DONE, NULL, NULL);
 
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index b5d0b68e..d34aca13 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -381,22 +381,22 @@ void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent,
 
 	/* set text of message to display */
 	switch (event) {
-		case PM_TRANS_PROGRESS_ADD_START:
+		case ALPM_TRANS_PROGRESS_ADD_START:
 			opr = _("installing");
 			break;
-		case PM_TRANS_PROGRESS_UPGRADE_START:
+		case ALPM_TRANS_PROGRESS_UPGRADE_START:
 			opr = _("upgrading");
 			break;
-		case PM_TRANS_PROGRESS_REMOVE_START:
+		case ALPM_TRANS_PROGRESS_REMOVE_START:
 			opr = _("removing");
 			break;
-		case PM_TRANS_PROGRESS_CONFLICTS_START:
+		case ALPM_TRANS_PROGRESS_CONFLICTS_START:
 			opr = _("checking for file conflicts");
 			break;
-		case PM_TRANS_PROGRESS_DISKSPACE_START:
+		case ALPM_TRANS_PROGRESS_DISKSPACE_START:
 			opr = _("checking available disk space");
 			break;
-		case PM_TRANS_PROGRESS_INTEGRITY_START:
+		case ALPM_TRANS_PROGRESS_INTEGRITY_START:
 			opr = _("checking package integrity");
 			break;
 		default: