Prefix alpm_transflag_t members with ALPM

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

4 files changed, 25 insertions, 25 deletions

diff --git a/src/pacman/database.c b/src/pacman/database.c
index 6b7bd4e2..5a1aa52b 100644
--- a/src/pacman/database.c
+++ b/src/pacman/database.c
@@ -49,9 +49,9 @@ int pacman_database(alpm_list_t *targets)
 		return 1;
 	}
 
-	if(config->flags & PM_TRANS_FLAG_ALLDEPS) { /* --asdeps */
+	if(config->flags & ALPM_TRANS_FLAG_ALLDEPS) { /* --asdeps */
 		reason = ALPM_PKG_REASON_DEPEND;
-	} else if(config->flags & PM_TRANS_FLAG_ALLEXPLICIT) { /* --asexplicit */
+	} else if(config->flags & ALPM_TRANS_FLAG_ALLEXPLICIT) { /* --asexplicit */
 		reason = ALPM_PKG_REASON_EXPLICIT;
 	} else {
 		pm_printf(ALPM_LOG_ERROR, _("no install reason specified (use -h for help)\n"));
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 18e49896..e855203a 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -445,8 +445,8 @@ static int parsearg_global(int opt)
 static int parsearg_database(int opt)
 {
 	switch(opt) {
-		case OP_ASDEPS: config->flags |= PM_TRANS_FLAG_ALLDEPS; break;
-		case OP_ASEXPLICIT: config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; break;
+		case OP_ASDEPS: config->flags |= ALPM_TRANS_FLAG_ALLDEPS; break;
+		case OP_ASEXPLICIT: config->flags |= ALPM_TRANS_FLAG_ALLEXPLICIT; break;
 		default: return 1;
 	}
 	return 0;
@@ -479,15 +479,15 @@ static int parsearg_trans(int opt)
 {
 	switch(opt) {
 		case 'd':
-			if(config->flags & PM_TRANS_FLAG_NODEPVERSION) {
-				config->flags |= PM_TRANS_FLAG_NODEPS;
+			if(config->flags & ALPM_TRANS_FLAG_NODEPVERSION) {
+				config->flags |= ALPM_TRANS_FLAG_NODEPS;
 			} else {
-				config->flags |= PM_TRANS_FLAG_NODEPVERSION;
+				config->flags |= ALPM_TRANS_FLAG_NODEPVERSION;
 			}
 			break;
-		case 'k': config->flags |= PM_TRANS_FLAG_DBONLY; break;
+		case 'k': config->flags |= ALPM_TRANS_FLAG_DBONLY; break;
 		case OP_NOPROGRESSBAR: config->noprogressbar = 1; break;
-		case OP_NOSCRIPTLET: config->flags |= PM_TRANS_FLAG_NOSCRIPTLET; break;
+		case OP_NOSCRIPTLET: config->flags |= ALPM_TRANS_FLAG_NOSCRIPTLET; break;
 		case 'p': config->print = 1; break;
 		case OP_PRINTFORMAT:
 			check_optarg();
@@ -503,16 +503,16 @@ static int parsearg_remove(int opt)
 	if(parsearg_trans(opt) == 0)
 		return 0;
 	switch(opt) {
-		case 'c': config->flags |= PM_TRANS_FLAG_CASCADE; break;
-		case 'n': config->flags |= PM_TRANS_FLAG_NOSAVE; break;
+		case 'c': config->flags |= ALPM_TRANS_FLAG_CASCADE; break;
+		case 'n': config->flags |= ALPM_TRANS_FLAG_NOSAVE; break;
 		case 's':
-			if(config->flags & PM_TRANS_FLAG_RECURSE) {
-				config->flags |= PM_TRANS_FLAG_RECURSEALL;
+			if(config->flags & ALPM_TRANS_FLAG_RECURSE) {
+				config->flags |= ALPM_TRANS_FLAG_RECURSEALL;
 			} else {
-				config->flags |= PM_TRANS_FLAG_RECURSE;
+				config->flags |= ALPM_TRANS_FLAG_RECURSE;
 			}
 			break;
-		case 'u': config->flags |= PM_TRANS_FLAG_UNNEEDED; break;
+		case 'u': config->flags |= ALPM_TRANS_FLAG_UNNEEDED; break;
 		default: return 1;
 	}
 	return 0;
@@ -524,9 +524,9 @@ static int parsearg_upgrade(int opt)
 	if(parsearg_trans(opt) == 0)
 		return 0;
 	switch(opt) {
-		case 'f': config->flags |= PM_TRANS_FLAG_FORCE; break;
-		case OP_ASDEPS: config->flags |= PM_TRANS_FLAG_ALLDEPS; break;
-		case OP_ASEXPLICIT: config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; break;
+		case 'f': config->flags |= ALPM_TRANS_FLAG_FORCE; break;
+		case OP_ASDEPS: config->flags |= ALPM_TRANS_FLAG_ALLDEPS; break;
+		case OP_ASEXPLICIT: config->flags |= ALPM_TRANS_FLAG_ALLEXPLICIT; break;
 		case OP_IGNORE:
 			parsearg_util_addlist(&(config->ignorepkg));
 			break;
@@ -543,7 +543,7 @@ static int parsearg_sync(int opt)
 	if(parsearg_upgrade(opt) == 0)
 		return 0;
 	switch(opt) {
-		case OP_NEEDED: config->flags |= PM_TRANS_FLAG_NEEDED; break;
+		case OP_NEEDED: config->flags |= ALPM_TRANS_FLAG_NEEDED; break;
 		case 'c': (config->op_s_clean)++; break;
 		case 'g': (config->group)++; break;
 		case 'i': (config->op_s_info)++; break;
@@ -553,8 +553,8 @@ static int parsearg_sync(int opt)
 		case 'u': (config->op_s_upgrade)++; break;
 		case 'w':
 			config->op_s_downloadonly = 1;
-			config->flags |= PM_TRANS_FLAG_DOWNLOADONLY;
-			config->flags |= PM_TRANS_FLAG_NOCONFLICTS;
+			config->flags |= ALPM_TRANS_FLAG_DOWNLOADONLY;
+			config->flags |= ALPM_TRANS_FLAG_NOCONFLICTS;
 			break;
 		case 'y': (config->op_s_sync)++; break;
 		default: return 1;
@@ -862,8 +862,8 @@ int main(int argc, char *argv[])
 	/* set up the print operations */
 	if(config->print && !config->op_s_clean) {
 		config->noconfirm = 1;
-		config->flags |= PM_TRANS_FLAG_NOCONFLICTS;
-		config->flags |= PM_TRANS_FLAG_NOLOCK;
+		config->flags |= ALPM_TRANS_FLAG_NOCONFLICTS;
+		config->flags |= ALPM_TRANS_FLAG_NOLOCK;
 		/* Display only errors */
 		config->logmask &= ~ALPM_LOG_WARNING;
 	}
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 7e47204e..dd6404f7 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -950,7 +950,7 @@ int pacman_sync(alpm_list_t *targets)
 	}
 
 	alpm_list_t *targs = alpm_list_strdup(targets);
-	if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY) && !config->print) {
+	if(!(config->flags & ALPM_TRANS_FLAG_DOWNLOADONLY) && !config->print) {
 		/* check for newer versions of packages to be upgraded first */
 		alpm_list_t *packages = syncfirst();
 		if(packages) {
diff --git a/src/pacman/util.c b/src/pacman/util.c
index a77643d1..2f55027a 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -749,7 +749,7 @@ void display_targets(const alpm_list_t *pkgs, int install)
 	if(install) {
 		size = humanize_size(dlsize, 'M', 1, &label);
 		printf(_("Total Download Size:    %.2f %s\n"), size, label);
-		if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY)) {
+		if(!(config->flags & ALPM_TRANS_FLAG_DOWNLOADONLY)) {
 			size = humanize_size(isize, 'M', 1, &label);
 			printf(_("Total Installed Size:   %.2f %s\n"), size, label);
 			/* only show this net value if different from raw installed size */