libdpkg: Uppercase and namespace pkgwant enum values

6 files changed, 22 insertions, 22 deletions

diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index eaf96438e..9dcb1da12 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/lib/dpkg/dpkg-db.h
@@ -151,13 +151,13 @@ struct trigaw {
 struct perpackagestate;
 
 enum pkgwant {
-	want_unknown,
-	want_install,
-	want_hold,
-	want_deinstall,
-	want_purge,
+	PKG_WANT_UNKNOWN,
+	PKG_WANT_INSTALL,
+	PKG_WANT_HOLD,
+	PKG_WANT_DEINSTALL,
+	PKG_WANT_PURGE,
 	/** Not allowed except as special sentinel value in some places. */
-	want_sentinel,
+	PKG_WANT_SENTINEL,
 };
 
 enum pkgeflag {
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c
index 15b55128f..3debd69bd 100644
--- a/lib/dpkg/dump.c
+++ b/lib/dpkg/dump.c
@@ -246,7 +246,7 @@ w_status(struct varbuf *vb,
 {
   if (pkgbin != &pkg->installed)
     return;
-  assert(pkg->want <= want_purge);
+  assert(pkg->want <= PKG_WANT_PURGE);
   assert(pkg->eflag <= eflag_reinstreq);
 
 #define PEND pkg->trigpend_head
diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c
index edbd4dfb2..c16ecbcf4 100644
--- a/lib/dpkg/parse.c
+++ b/lib/dpkg/parse.c
@@ -279,10 +279,10 @@ pkg_parse_verify(struct parsedb_state *ps,
   if (!(ps->flags & pdb_recordavailable) &&
       pkg->status == stat_notinstalled &&
       pkg->eflag == eflag_ok &&
-      (pkg->want == want_purge ||
-       pkg->want == want_deinstall ||
-       pkg->want == want_hold)) {
-    pkg_set_want(pkg, want_unknown);
+      (pkg->want == PKG_WANT_PURGE ||
+       pkg->want == PKG_WANT_DEINSTALL ||
+       pkg->want == PKG_WANT_HOLD)) {
+    pkg_set_want(pkg, PKG_WANT_UNKNOWN);
   }
 
   /* XXX: Mark not-installed non-arch-qualified selections for automatic
@@ -292,9 +292,9 @@ pkg_parse_verify(struct parsedb_state *ps,
   if (ps->type == pdb_file_status &&
       pkg->status == stat_notinstalled &&
       pkg->eflag == eflag_ok &&
-      pkg->want == want_install &&
+      pkg->want == PKG_WANT_INSTALL &&
       pkgbin->arch->type == DPKG_ARCH_EMPTY)
-    pkg->want = want_unknown;
+    pkg->want = PKG_WANT_UNKNOWN;
 }
 
 struct pkgcount {
diff --git a/lib/dpkg/pkg-namevalue.c b/lib/dpkg/pkg-namevalue.c
index a1cb11a9a..ec0566ff5 100644
--- a/lib/dpkg/pkg-namevalue.c
+++ b/lib/dpkg/pkg-namevalue.c
@@ -51,11 +51,11 @@ const struct namevalue priorityinfos[] = {
 };
 
 const struct namevalue wantinfos[] = {
-	NAMEVALUE_DEF("unknown",		want_unknown),
-	NAMEVALUE_DEF("install",		want_install),
-	NAMEVALUE_DEF("hold",			want_hold),
-	NAMEVALUE_DEF("deinstall",		want_deinstall),
-	NAMEVALUE_DEF("purge",			want_purge),
+	NAMEVALUE_DEF("unknown",		PKG_WANT_UNKNOWN),
+	NAMEVALUE_DEF("install",		PKG_WANT_INSTALL),
+	NAMEVALUE_DEF("hold",			PKG_WANT_HOLD),
+	NAMEVALUE_DEF("deinstall",		PKG_WANT_DEINSTALL),
+	NAMEVALUE_DEF("purge",			PKG_WANT_PURGE),
 	{ .name = NULL }
 };
 
diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c
index 4a3465345..ea4681255 100644
--- a/lib/dpkg/pkg.c
+++ b/lib/dpkg/pkg.c
@@ -114,7 +114,7 @@ pkg_blank(struct pkginfo *pkg)
 {
 	pkg->status = stat_notinstalled;
 	pkg->eflag = eflag_ok;
-	pkg->want = want_unknown;
+	pkg->want = PKG_WANT_UNKNOWN;
 	pkg->priority = pri_unknown;
 	pkg->otherpriority = NULL;
 	pkg->section = NULL;
@@ -187,7 +187,7 @@ pkg_is_informative(struct pkginfo *pkg, struct pkgbin *pkgbin)
 {
 	/* We ignore Section and Priority, as these tend to hang around. */
 	if (pkgbin == &pkg->installed &&
-	    (pkg->want != want_unknown ||
+	    (pkg->want != PKG_WANT_UNKNOWN ||
 	     pkg->eflag != eflag_ok ||
 	     pkg->status != stat_notinstalled ||
 	     dpkg_version_is_informative(&pkg->configversion)))
diff --git a/lib/dpkg/test/t-pkginfo.c b/lib/dpkg/test/t-pkginfo.c
index eb66dedae..b42439f0f 100644
--- a/lib/dpkg/test/t-pkginfo.c
+++ b/lib/dpkg/test/t-pkginfo.c
@@ -2,7 +2,7 @@
  * libdpkg - Debian packaging suite library routines
  * t-pkginfo.c - test pkginfo handling
  *
- * Copyright © 2009-2010,2012 Guillem Jover <guillem@debian.org>
+ * Copyright © 2009-2010,2012-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
@@ -33,7 +33,7 @@ test_pkginfo_informative(void)
 	pkg_blank(&pkg);
 	test_fail(pkg_is_informative(&pkg, &pkg.installed));
 
-	pkg_set_want(&pkg, want_purge);
+	pkg_set_want(&pkg, PKG_WANT_PURGE);
 	test_pass(pkg_is_informative(&pkg, &pkg.installed));
 
 	pkg_blank(&pkg);