From eb39a9482b711d58a6c12840800f2372dee0c120 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 2 Jul 2011 02:01:38 +1000 Subject: Prefix alpm_pkgreason_t members with ALPM Signed-off-by: Allan McRae --- src/pacman/database.c | 6 +++--- src/pacman/package.c | 4 ++-- src/pacman/query.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/pacman') diff --git a/src/pacman/database.c b/src/pacman/database.c index b7490cea..d39ccf78 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -50,9 +50,9 @@ int pacman_database(alpm_list_t *targets) } if(config->flags & PM_TRANS_FLAG_ALLDEPS) { /* --asdeps */ - reason = PM_PKG_REASON_DEPEND; + reason = ALPM_PKG_REASON_DEPEND; } else if(config->flags & PM_TRANS_FLAG_ALLEXPLICIT) { /* --asexplicit */ - reason = PM_PKG_REASON_EXPLICIT; + reason = ALPM_PKG_REASON_EXPLICIT; } else { pm_printf(PM_LOG_ERROR, _("no install reason specified (use -h for help)\n")); return 1; @@ -71,7 +71,7 @@ int pacman_database(alpm_list_t *targets) pkgname, alpm_strerror(alpm_errno(config->handle))); retval = 1; } else { - if(reason == PM_PKG_REASON_DEPEND) { + if(reason == ALPM_PKG_REASON_DEPEND) { printf(_("%s: install reason has been set to 'installed as dependency'\n"), pkgname); } else { printf(_("%s: install reason has been set to 'explicitly installed'\n"), pkgname); diff --git a/src/pacman/package.c b/src/pacman/package.c index 6b480873..1c4e9766 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -70,10 +70,10 @@ void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) } switch((long)alpm_pkg_get_reason(pkg)) { - case PM_PKG_REASON_EXPLICIT: + case ALPM_PKG_REASON_EXPLICIT: reason = _("Explicitly installed"); break; - case PM_PKG_REASON_DEPEND: + case ALPM_PKG_REASON_DEPEND: reason = _("Installed as a dependency for another package"); break; default: diff --git a/src/pacman/query.c b/src/pacman/query.c index 826c2262..6500c2da 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -370,12 +370,12 @@ static int filter(alpm_pkg_t *pkg) { /* check if this package was explicitly installed */ if(config->op_q_explicit && - alpm_pkg_get_reason(pkg) != PM_PKG_REASON_EXPLICIT) { + alpm_pkg_get_reason(pkg) != ALPM_PKG_REASON_EXPLICIT) { return 0; } /* check if this package was installed as a dependency */ if(config->op_q_deps && - alpm_pkg_get_reason(pkg) != PM_PKG_REASON_DEPEND) { + alpm_pkg_get_reason(pkg) != ALPM_PKG_REASON_DEPEND) { return 0; } /* check if this pkg isn't in a sync DB */ -- cgit v1.2.3-24-g4f1b