libdpkg: Uppercase and namespace pkgmultiarch enum values

6 files changed, 21 insertions, 21 deletions

diff --git a/lib/dpkg/depcon.c b/lib/dpkg/depcon.c
index 2d181d6f5..cd8d8a0bd 100644
--- a/lib/dpkg/depcon.c
+++ b/lib/dpkg/depcon.c
@@ -58,12 +58,12 @@ deparchsatisfied(struct pkgbin *it, const struct dpkg_arch *it_arch,
 	const struct dpkg_arch *dep_arch, *pkg_arch;
 
 	if (against->arch_is_implicit &&
-	    it->multiarch == multiarch_foreign)
+	    it->multiarch == PKG_MULTIARCH_FOREIGN)
 		return true;
 
 	dep_arch = against->arch;
 	if (dep_arch->type == DPKG_ARCH_WILDCARD &&
-	    (it->multiarch == multiarch_allowed ||
+	    (it->multiarch == PKG_MULTIARCH_ALLOWED ||
 	     against->up->type == dep_conflicts ||
 	     against->up->type == dep_replaces ||
 	     against->up->type == dep_breaks))
diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index 96f1222e4..eaf96438e 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/lib/dpkg/dpkg-db.h
@@ -93,10 +93,10 @@ struct filedetails {
 };
 
 enum pkgmultiarch {
-	multiarch_no,
-	multiarch_same,
-	multiarch_allowed,
-	multiarch_foreign,
+	PKG_MULTIARCH_NO,
+	PKG_MULTIARCH_SAME,
+	PKG_MULTIARCH_ALLOWED,
+	PKG_MULTIARCH_FOREIGN,
 };
 
 /**
diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c
index 72b7c6cf8..edbd4dfb2 100644
--- a/lib/dpkg/parse.c
+++ b/lib/dpkg/parse.c
@@ -209,11 +209,11 @@ pkg_parse_verify(struct parsedb_state *ps,
     pkgbin->arch = dpkg_arch_get(DPKG_ARCH_EMPTY);
 
   if (pkgbin->arch->type == DPKG_ARCH_EMPTY &&
-      pkgbin->multiarch == multiarch_same)
+      pkgbin->multiarch == PKG_MULTIARCH_SAME)
     parse_error(ps, _("package has field '%s' but is missing architecture"),
                 "Multi-Arch: same");
   if (pkgbin->arch->type == DPKG_ARCH_ALL &&
-      pkgbin->multiarch == multiarch_same)
+      pkgbin->multiarch == PKG_MULTIARCH_SAME)
     parse_error(ps, _("package has field '%s' but is architecture all"),
                 "Multi-Arch: same");
 
@@ -310,7 +310,7 @@ parse_count_pkg_instance(struct pkgcount *count,
   if (pkg->status == stat_notinstalled)
      return;
 
-  if (pkgbin->multiarch == multiarch_same)
+  if (pkgbin->multiarch == PKG_MULTIARCH_SAME)
     count->multi++;
   else
     count->single++;
@@ -376,7 +376,7 @@ parse_find_set_slot(struct parsedb_state *ps,
  * slot architecture, because cross-grading is just not possible.
  *
  * If there's 1 instance, we are cross-grading and both installed and
- * candidate are not multiarch_same, we have to reuse the existing single
+ * candidate are not PKG_MULTIARCH_SAME, we have to reuse the existing single
  * slot regardless of the arch differing between the two. If we are not
  * cross-grading, then we use the entry with the matching arch.
  */
@@ -394,7 +394,7 @@ parse_find_pkg_slot(struct parsedb_state *ps,
      * “Multi-Arch: same”, then we preserve the previous behaviour of
      * possible architecture switch, for example from native to all. */
     if (pkgset_installed_instances(db_set) == 1 &&
-        new_pkgbin->multiarch != multiarch_same)
+        new_pkgbin->multiarch != PKG_MULTIARCH_SAME)
       return pkg_db_get_singleton(db_set);
     else
       return pkg_db_get_pkg(db_set, new_pkgbin->arch);
@@ -408,7 +408,7 @@ parse_find_pkg_slot(struct parsedb_state *ps,
 
     /* Verify we don't allow something that will mess up the db. */
     if (pkgset_installed_instances(db_set) > 1 &&
-        !selection && new_pkgbin->multiarch != multiarch_same)
+        !selection && new_pkgbin->multiarch != PKG_MULTIARCH_SAME)
       ohshit(_("%s %s (Multi-Arch: %s) is not co-installable with "
                "%s which has multiple installed instances"),
              pkgbin_name(new_pkg, new_pkgbin, pnaw_always),
@@ -424,8 +424,8 @@ parse_find_pkg_slot(struct parsedb_state *ps,
     if (pkgset_installed_instances(db_set) == 1) {
       db_pkg = pkg_db_get_singleton(db_set);
 
-      if (db_pkg->installed.multiarch == multiarch_same &&
-          new_pkgbin->multiarch == multiarch_same)
+      if (db_pkg->installed.multiarch == PKG_MULTIARCH_SAME &&
+          new_pkgbin->multiarch == PKG_MULTIARCH_SAME)
         return pkg_db_get_pkg(db_set, new_pkgbin->arch);
       else
         return db_pkg;
diff --git a/lib/dpkg/pkg-namevalue.c b/lib/dpkg/pkg-namevalue.c
index 32647758e..a1cb11a9a 100644
--- a/lib/dpkg/pkg-namevalue.c
+++ b/lib/dpkg/pkg-namevalue.c
@@ -32,10 +32,10 @@ const struct namevalue booleaninfos[] = {
 };
 
 const struct namevalue multiarchinfos[] = {
-	NAMEVALUE_DEF("no",			multiarch_no),
-	NAMEVALUE_DEF("same",			multiarch_same),
-	NAMEVALUE_DEF("allowed",		multiarch_allowed),
-	NAMEVALUE_DEF("foreign",		multiarch_foreign),
+	NAMEVALUE_DEF("no",			PKG_MULTIARCH_NO),
+	NAMEVALUE_DEF("same",			PKG_MULTIARCH_SAME),
+	NAMEVALUE_DEF("allowed",		PKG_MULTIARCH_ALLOWED),
+	NAMEVALUE_DEF("foreign",		PKG_MULTIARCH_FOREIGN),
 	{ .name = NULL }
 };
 
diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c
index bae8dad05..fa74419b4 100644
--- a/lib/dpkg/pkg-show.c
+++ b/lib/dpkg/pkg-show.c
@@ -43,7 +43,7 @@ pkgbin_name_needs_arch(const struct pkgbin *pkgbin,
 			break;
 		return true;
 	case pnaw_nonambig:
-		if (pkgbin->multiarch != multiarch_same)
+		if (pkgbin->multiarch != PKG_MULTIARCH_SAME)
 			break;
 	/* Fall through. */
 	case pnaw_always:
diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c
index 45103ecad..4a3465345 100644
--- a/lib/dpkg/pkg.c
+++ b/lib/dpkg/pkg.c
@@ -132,9 +132,9 @@ pkg_blank(struct pkginfo *pkg)
 	 * because they are part of the package specification, and needed
 	 * for selections. */
 	pkg->installed.arch = dpkg_arch_get(DPKG_ARCH_NONE);
-	pkg->installed.multiarch = multiarch_no;
+	pkg->installed.multiarch = PKG_MULTIARCH_NO;
 	pkg->available.arch = dpkg_arch_get(DPKG_ARCH_NONE);
-	pkg->available.multiarch = multiarch_no;
+	pkg->available.multiarch = PKG_MULTIARCH_NO;
 }
 
 void