libdpkg: Uppercase and namespace pkgwant enum values

8 files changed, 24 insertions, 21 deletions

diff --git a/src/archives.c b/src/archives.c
index 67544abb9..6bd4e35da 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -1435,7 +1435,8 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg,
       ensure_package_clientdata(fixbyrm);
     }
     if (((pkg->available.essential && fixbyrm->installed.essential) ||
-         (((fixbyrm->want != want_install && fixbyrm->want != want_hold) ||
+         (((fixbyrm->want != PKG_WANT_INSTALL &&
+            fixbyrm->want != PKG_WANT_HOLD) ||
            does_replace(pkg, &pkg->available, fixbyrm, &fixbyrm->installed)) &&
           (!fixbyrm->installed.essential || fc_removeessential)))) {
       assert(fixbyrm->clientdata->istobe == PKG_ISTOBE_NORMAL ||
@@ -1699,7 +1700,7 @@ wanttoinstall(struct pkginfo *pkg)
 {
   int rc;
 
-  if (pkg->want != want_install && pkg->want != want_hold) {
+  if (pkg->want != PKG_WANT_INSTALL && pkg->want != PKG_WANT_HOLD) {
     if (f_alsoselect) {
       printf(_("Selecting previously unselected package %s.\n"),
              pkgbin_name(pkg, &pkg->available, pnaw_nonambig));
diff --git a/src/enquiry.c b/src/enquiry.c
index b54362b7f..701d662a9 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -245,7 +245,7 @@ struct sectionentry {
 static bool
 yettobeunpacked(struct pkginfo *pkg, const char **thissect)
 {
-  if (pkg->want != want_install)
+  if (pkg->want != PKG_WANT_INSTALL)
     return false;
 
   switch (pkg->status) {
@@ -460,7 +460,7 @@ predeppackage(const char *const *argv)
   it = pkg_db_iter_new();
   while (!dep && (pkg = pkg_db_iter_next_pkg(it))) {
     /* Ignore packages user doesn't want. */
-    if (pkg->want != want_install)
+    if (pkg->want != PKG_WANT_INSTALL)
       continue;
     /* Ignore packages not available. */
     if (!pkg->files)
diff --git a/src/errors.c b/src/errors.c
index 0f3e5e51c..03b7b1da9 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -3,6 +3,7 @@
  * errors.c - per package error handling
  *
  * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 2007-2014 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -121,7 +122,7 @@ reportbroken_retexitstatus(int ret)
 bool
 skip_due_to_hold(struct pkginfo *pkg)
 {
-  if (pkg->want != want_hold)
+  if (pkg->want != PKG_WANT_HOLD)
     return false;
   if (fc_hold) {
     notice(_("package %s was on hold, processing it anyway as you requested"),
diff --git a/src/packages.c b/src/packages.c
index 3620be6ef..0efe0937d 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -73,19 +73,19 @@ enqueue_pending(void)
             pkg->status == stat_halfconfigured ||
             pkg->trigpend_head))
         continue;
-      if (pkg->want != want_install)
+      if (pkg->want != PKG_WANT_INSTALL)
         continue;
       break;
     case act_triggers:
       if (!pkg->trigpend_head)
         continue;
-      if (pkg->want != want_install)
+      if (pkg->want != PKG_WANT_INSTALL)
         continue;
       break;
     case act_remove:
     case act_purge:
-      if (pkg->want != want_purge) {
-        if (pkg->want != want_deinstall)
+      if (pkg->want != PKG_WANT_PURGE) {
+        if (pkg->want != PKG_WANT_DEINSTALL)
           continue;
         if (pkg->status == stat_configfiles)
           continue;
diff --git a/src/querycmd.c b/src/querycmd.c
index cab1eb0c9..98d62a798 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -464,7 +464,7 @@ enqperpackage(const char *const *argv)
           pkg->priority == pri_unknown &&
           str_is_unset(pkg->section) &&
           !pkg->files &&
-          pkg->want == want_unknown &&
+          pkg->want == PKG_WANT_UNKNOWN &&
           !pkg_is_informative(pkg, &pkg->installed)) {
         notice(_("package '%s' is not installed and no information is available"),
                pkg_name(pkg, pnaw_nonambig));
diff --git a/src/remove.c b/src/remove.c
index 013634928..17996c8ff 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -93,11 +93,11 @@ void deferred_remove(struct pkginfo *pkg) {
   debug(dbg_general, "deferred_remove package %s",
         pkg_name(pkg, pnaw_always));
 
-  if (!f_pending && pkg->want != want_unknown) {
+  if (!f_pending && pkg->want != PKG_WANT_UNKNOWN) {
     if (cipaction->arg_int == act_purge)
-      pkg_set_want(pkg, want_purge);
+      pkg_set_want(pkg, PKG_WANT_PURGE);
     else
-      pkg_set_want(pkg, want_deinstall);
+      pkg_set_want(pkg, PKG_WANT_DEINSTALL);
 
     if (!f_noact)
       modstatdb_note(pkg);
@@ -613,16 +613,16 @@ void removal_bulk(struct pkginfo *pkg) {
      * go straight into ‘purge’.  */
     debug(dbg_general, "removal_bulk no postrm, no conffiles, purging");
 
-    pkg_set_want(pkg, want_purge);
+    pkg_set_want(pkg, PKG_WANT_PURGE);
     dpkg_version_blank(&pkg->configversion);
-  } else if (pkg->want == want_purge) {
+  } else if (pkg->want == PKG_WANT_PURGE) {
 
     removal_bulk_remove_configfiles(pkg);
 
   }
 
   /* I.e., either of the two branches above. */
-  if (pkg->want == want_purge) {
+  if (pkg->want == PKG_WANT_PURGE) {
     const char *filename;
 
     /* Retry empty directories, and warn on any leftovers that aren't. */
@@ -641,7 +641,7 @@ void removal_bulk(struct pkginfo *pkg) {
       ohshite(_("can't remove old postrm script"));
 
     pkg_set_status(pkg, stat_notinstalled);
-    pkg_set_want(pkg, want_unknown);
+    pkg_set_want(pkg, PKG_WANT_UNKNOWN);
 
     /* This will mess up reverse links, but if we follow them
      * we won't go back because pkg->status is stat_notinstalled. */
diff --git a/src/select.c b/src/select.c
index 2d43a1f0e..4aee6ac31 100644
--- a/src/select.c
+++ b/src/select.c
@@ -46,7 +46,8 @@ static void getsel1package(struct pkginfo *pkg) {
   const char *pkgname;
   int l;
 
-  if (pkg->want == want_unknown) return;
+  if (pkg->want == PKG_WANT_UNKNOWN)
+    return;
   pkgname = pkg_name(pkg, pnaw_nonambig);
   l = strlen(pkgname);
   l >>= 3;
@@ -204,7 +205,7 @@ clearselections(const char *const *argv)
   it = pkg_db_iter_new();
   while ((pkg = pkg_db_iter_next_pkg(it))) {
     if (!pkg->installed.essential)
-      pkg_set_want(pkg, want_deinstall);
+      pkg_set_want(pkg, PKG_WANT_DEINSTALL);
   }
   pkg_db_iter_free(it);
 
diff --git a/src/unpack.c b/src/unpack.c
index a7bb1262f..b2d12f24e 100644
--- a/src/unpack.c
+++ b/src/unpack.c
@@ -358,7 +358,7 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour)
   dir_sync_path(pkg_infodb_get_dir());
 
   pkg_set_status(pkg, stat_notinstalled);
-  pkg_set_want(pkg, want_unknown);
+  pkg_set_want(pkg, PKG_WANT_UNKNOWN);
   pkg_reset_eflags(pkg);
 
   dpkg_version_blank(&pkg->configversion);
@@ -518,7 +518,7 @@ void process_archive(const char *filename) {
   clear_istobes();
 
   if (wanttoinstall(pkg)) {
-    pkg_set_want(pkg, want_install);
+    pkg_set_want(pkg, PKG_WANT_INSTALL);
   } else {
       pop_cleanup(ehflag_normaltidy);
       return;