libdpkg: Uppercase and namespace pkgpriority enum values

7 files changed, 23 insertions, 23 deletions

diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index 0fd2707d2..12f302977 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/lib/dpkg/dpkg-db.h
@@ -177,14 +177,14 @@ enum pkgstatus {
 };
 
 enum pkgpriority {
-	pri_required,
-	pri_important,
-	pri_standard,
-	pri_optional,
-	pri_extra,
-	pri_other,
-	pri_unknown,
-	pri_unset = -1,
+	PKG_PRIO_REQUIRED,
+	PKG_PRIO_IMPORTANT,
+	PKG_PRIO_STANDARD,
+	PKG_PRIO_OPTIONAL,
+	PKG_PRIO_EXTRA,
+	PKG_PRIO_OTHER,
+	PKG_PRIO_UNKNOWN,
+	PKG_PRIO_UNSET = -1,
 };
 
 /**
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c
index f4a9b4b36..501a43938 100644
--- a/lib/dpkg/dump.c
+++ b/lib/dpkg/dump.c
@@ -229,9 +229,9 @@ w_priority(struct varbuf *vb,
            const struct pkginfo *pkg, const struct pkgbin *pkgbin,
            enum fwriteflags flags, const struct fieldinfo *fip)
 {
-  if (pkg->priority == pri_unknown)
+  if (pkg->priority == PKG_PRIO_UNKNOWN)
     return;
-  assert(pkg->priority <= pri_unknown);
+  assert(pkg->priority <= PKG_PRIO_UNKNOWN);
   if (flags&fw_printheader)
     varbuf_add_str(vb, "Priority: ");
   varbuf_add_str(vb, pkg_priority_name(pkg));
diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c
index 469714f16..bbee2ab30 100644
--- a/lib/dpkg/fields.c
+++ b/lib/dpkg/fields.c
@@ -207,7 +207,7 @@ f_priority(struct pkginfo *pkg, struct pkgbin *pkgbin,
   if (!*value) return;
   pkg->priority = parse_nv_last(ps, _("word in 'Priority' field"),
                                 priorityinfos, value);
-  if (pkg->priority == pri_other)
+  if (pkg->priority == PKG_PRIO_OTHER)
     pkg->otherpriority = nfstrsave(value);
 }
 
diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c
index 2104c6ecd..63c85f6d5 100644
--- a/lib/dpkg/parse.c
+++ b/lib/dpkg/parse.c
@@ -449,11 +449,11 @@ pkg_parse_copy(struct parsedb_state *ps,
       !((ps->flags & pdb_weakclassification) &&
         str_is_set(dst_pkg->section)))
     dst_pkg->section = src_pkg->section;
-  if (src_pkg->priority != pri_unknown &&
+  if (src_pkg->priority != PKG_PRIO_UNKNOWN &&
       !((ps->flags & pdb_weakclassification) &&
-        dst_pkg->priority != pri_unknown)) {
+        dst_pkg->priority != PKG_PRIO_UNKNOWN)) {
     dst_pkg->priority = src_pkg->priority;
-    if (src_pkg->priority == pri_other)
+    if (src_pkg->priority == PKG_PRIO_OTHER)
       dst_pkg->otherpriority = src_pkg->otherpriority;
   }
 
diff --git a/lib/dpkg/pkg-namevalue.c b/lib/dpkg/pkg-namevalue.c
index 7430aa1e3..771d272e1 100644
--- a/lib/dpkg/pkg-namevalue.c
+++ b/lib/dpkg/pkg-namevalue.c
@@ -40,13 +40,13 @@ const struct namevalue multiarchinfos[] = {
 };
 
 const struct namevalue priorityinfos[] = {
-	NAMEVALUE_DEF("required",		pri_required),
-	NAMEVALUE_DEF("important",		pri_important),
-	NAMEVALUE_DEF("standard",		pri_standard),
-	NAMEVALUE_DEF("optional",		pri_optional),
-	NAMEVALUE_DEF("extra",			pri_extra),
-	NAMEVALUE_FALLBACK_DEF("this is a bug - please report", pri_other),
-	NAMEVALUE_DEF("unknown",		pri_unknown),
+	NAMEVALUE_DEF("required",		PKG_PRIO_REQUIRED),
+	NAMEVALUE_DEF("important",		PKG_PRIO_IMPORTANT),
+	NAMEVALUE_DEF("standard",		PKG_PRIO_STANDARD),
+	NAMEVALUE_DEF("optional",		PKG_PRIO_OPTIONAL),
+	NAMEVALUE_DEF("extra",			PKG_PRIO_EXTRA),
+	NAMEVALUE_FALLBACK_DEF("this is a bug - please report", PKG_PRIO_OTHER),
+	NAMEVALUE_DEF("unknown",		PKG_PRIO_UNKNOWN),
 	{ .name = NULL }
 };
 
diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c
index fa74419b4..e6a508c5d 100644
--- a/lib/dpkg/pkg-show.c
+++ b/lib/dpkg/pkg-show.c
@@ -216,7 +216,7 @@ pkg_status_name(const struct pkginfo *pkg)
 const char *
 pkg_priority_name(const struct pkginfo *pkg)
 {
-	if (pkg->priority == pri_other)
+	if (pkg->priority == PKG_PRIO_OTHER)
 		return pkg->otherpriority;
 	else
 		return priorityinfos[pkg->priority].name;
diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c
index e44502f74..7e8f12c69 100644
--- a/lib/dpkg/pkg.c
+++ b/lib/dpkg/pkg.c
@@ -115,7 +115,7 @@ pkg_blank(struct pkginfo *pkg)
 	pkg->status = stat_notinstalled;
 	pkg->eflag = PKG_EFLAG_OK;
 	pkg->want = PKG_WANT_UNKNOWN;
-	pkg->priority = pri_unknown;
+	pkg->priority = PKG_PRIO_UNKNOWN;
 	pkg->otherpriority = NULL;
 	pkg->section = NULL;
 	dpkg_version_blank(&pkg->configversion);