Prefix alpm_transevt_t members with ALPM

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

1 files changed, 27 insertions, 27 deletions

diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index f579e7ae..6a65cbb0 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -156,93 +156,93 @@ static void fill_progress(const int bar_percent, const int disp_percent,
 void cb_trans_evt(alpm_transevt_t event, void *data1, void *data2)
 {
 	switch(event) {
-		case PM_TRANS_EVT_CHECKDEPS_START:
+		case ALPM_TRANS_EVT_CHECKDEPS_START:
 		  printf(_("checking dependencies...\n"));
 			break;
-		case PM_TRANS_EVT_FILECONFLICTS_START:
+		case ALPM_TRANS_EVT_FILECONFLICTS_START:
 			if(config->noprogressbar) {
 				printf(_("checking for file conflicts...\n"));
 			}
 			break;
-		case PM_TRANS_EVT_RESOLVEDEPS_START:
+		case ALPM_TRANS_EVT_RESOLVEDEPS_START:
 			printf(_("resolving dependencies...\n"));
 			break;
-		case PM_TRANS_EVT_INTERCONFLICTS_START:
+		case ALPM_TRANS_EVT_INTERCONFLICTS_START:
 			printf(_("looking for inter-conflicts...\n"));
 			break;
-		case PM_TRANS_EVT_ADD_START:
+		case ALPM_TRANS_EVT_ADD_START:
 			if(config->noprogressbar) {
 				printf(_("installing %s...\n"), alpm_pkg_get_name(data1));
 			}
 			break;
-		case PM_TRANS_EVT_ADD_DONE:
+		case ALPM_TRANS_EVT_ADD_DONE:
 			alpm_logaction(config->handle, "installed %s (%s)\n",
 			         alpm_pkg_get_name(data1),
 			         alpm_pkg_get_version(data1));
 			display_optdepends(data1);
 			break;
-		case PM_TRANS_EVT_REMOVE_START:
+		case ALPM_TRANS_EVT_REMOVE_START:
 			if(config->noprogressbar) {
 			printf(_("removing %s...\n"), alpm_pkg_get_name(data1));
 			}
 			break;
-		case PM_TRANS_EVT_REMOVE_DONE:
+		case ALPM_TRANS_EVT_REMOVE_DONE:
 			alpm_logaction(config->handle, "removed %s (%s)\n",
 			         alpm_pkg_get_name(data1),
 			         alpm_pkg_get_version(data1));
 			break;
-		case PM_TRANS_EVT_UPGRADE_START:
+		case ALPM_TRANS_EVT_UPGRADE_START:
 			if(config->noprogressbar) {
 				printf(_("upgrading %s...\n"), alpm_pkg_get_name(data1));
 			}
 			break;
-		case PM_TRANS_EVT_UPGRADE_DONE:
+		case ALPM_TRANS_EVT_UPGRADE_DONE:
 			alpm_logaction(config->handle, "upgraded %s (%s -> %s)\n",
 			         (char *)alpm_pkg_get_name(data1),
 			         (char *)alpm_pkg_get_version(data2),
 			         (char *)alpm_pkg_get_version(data1));
 			display_new_optdepends(data2,data1);
 			break;
-		case PM_TRANS_EVT_INTEGRITY_START:
+		case ALPM_TRANS_EVT_INTEGRITY_START:
 			if(config->noprogressbar) {
 				printf(_("checking package integrity...\n"));
 			}
 			break;
-		case PM_TRANS_EVT_DELTA_INTEGRITY_START:
+		case ALPM_TRANS_EVT_DELTA_INTEGRITY_START:
 			printf(_("checking delta integrity...\n"));
 			break;
-		case PM_TRANS_EVT_DELTA_PATCHES_START:
+		case ALPM_TRANS_EVT_DELTA_PATCHES_START:
 			printf(_("applying deltas...\n"));
 			break;
-		case PM_TRANS_EVT_DELTA_PATCH_START:
+		case ALPM_TRANS_EVT_DELTA_PATCH_START:
 			printf(_("generating %s with %s... "), (char *)data1, (char *)data2);
 			break;
-		case PM_TRANS_EVT_DELTA_PATCH_DONE:
+		case ALPM_TRANS_EVT_DELTA_PATCH_DONE:
 			printf(_("success!\n"));
 			break;
-		case PM_TRANS_EVT_DELTA_PATCH_FAILED:
+		case ALPM_TRANS_EVT_DELTA_PATCH_FAILED:
 			printf(_("failed.\n"));
 			break;
-		case PM_TRANS_EVT_SCRIPTLET_INFO:
+		case ALPM_TRANS_EVT_SCRIPTLET_INFO:
 			printf("%s", (char *)data1);
 			break;
-		case PM_TRANS_EVT_RETRIEVE_START:
+		case ALPM_TRANS_EVT_RETRIEVE_START:
 			printf(_(":: Retrieving packages from %s...\n"), (char *)data1);
 			break;
-		case PM_TRANS_EVT_DISKSPACE_START:
+		case ALPM_TRANS_EVT_DISKSPACE_START:
 			if(config->noprogressbar) {
 				printf(_("checking available disk space...\n"));
 			}
 			break;
 		/* all the simple done events, with fallthrough for each */
-		case PM_TRANS_EVT_FILECONFLICTS_DONE:
-		case PM_TRANS_EVT_CHECKDEPS_DONE:
-		case PM_TRANS_EVT_RESOLVEDEPS_DONE:
-		case PM_TRANS_EVT_INTERCONFLICTS_DONE:
-		case PM_TRANS_EVT_INTEGRITY_DONE:
-		case PM_TRANS_EVT_DELTA_INTEGRITY_DONE:
-		case PM_TRANS_EVT_DELTA_PATCHES_DONE:
-		case PM_TRANS_EVT_DISKSPACE_DONE:
+		case ALPM_TRANS_EVT_FILECONFLICTS_DONE:
+		case ALPM_TRANS_EVT_CHECKDEPS_DONE:
+		case ALPM_TRANS_EVT_RESOLVEDEPS_DONE:
+		case ALPM_TRANS_EVT_INTERCONFLICTS_DONE:
+		case ALPM_TRANS_EVT_INTEGRITY_DONE:
+		case ALPM_TRANS_EVT_DELTA_INTEGRITY_DONE:
+		case ALPM_TRANS_EVT_DELTA_PATCHES_DONE:
+		case ALPM_TRANS_EVT_DISKSPACE_DONE:
 			/* nothing */
 			break;
 	}