libdpkg: Uppercase and namespace pkgmultiarch enum values

5 files changed, 10 insertions, 10 deletions

diff --git a/src/archives.c b/src/archives.c
index 161099078..67544abb9 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -157,7 +157,7 @@ filesavespackage(struct fileinlist *file,
     /* A Multi-Arch: same package can share files and their presence in a
      * third package of the same set is not a sign that we can get rid of
      * it. */
-    if (pkgtobesaved->installed.multiarch == multiarch_same &&
+    if (pkgtobesaved->installed.multiarch == PKG_MULTIARCH_SAME &&
         thirdpkg->set == pkgtobesaved->set)
       continue;
 
@@ -915,8 +915,8 @@ tarobject(void *ctx, struct tar_entry *ti)
        * is allowed when they are not getting in sync, otherwise the
        * file content must match the installed file. */
       if (otherpkg->set == tc->pkg->set &&
-          otherpkg->installed.multiarch == multiarch_same &&
-          tc->pkg->available.multiarch == multiarch_same) {
+          otherpkg->installed.multiarch == PKG_MULTIARCH_SAME &&
+          tc->pkg->available.multiarch == PKG_MULTIARCH_SAME) {
         if (statr == 0 && tc->pkgset_getting_in_sync)
           refcounting = true;
         debug(dbg_eachfiledetail, "tarobject ... shared with %s %s (syncing=%d)",
diff --git a/src/infodb-access.c b/src/infodb-access.c
index 7679312ea..f8289ea4d 100644
--- a/src/infodb-access.c
+++ b/src/infodb-access.c
@@ -67,7 +67,7 @@ pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin,
 	/* Make sure to always read and verify the format version. */
 	db_format = pkg_infodb_get_format();
 
-	if (pkgbin->multiarch == multiarch_same &&
+	if (pkgbin->multiarch == PKG_MULTIARCH_SAME &&
 	    db_format == PKG_INFODB_FORMAT_MULTIARCH)
 		pkgname = pkgbin_name(pkg, pkgbin, pnaw_always);
 	else
diff --git a/src/infodb-format.c b/src/infodb-format.c
index 6f3851359..432930890 100644
--- a/src/infodb-format.c
+++ b/src/infodb-format.c
@@ -140,7 +140,7 @@ pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin,
 	varbuf_add_str(&vb, pkg_infodb_get_dir());
 	varbuf_add_char(&vb, '/');
 	varbuf_add_str(&vb, pkg->set->name);
-	if (pkgbin->multiarch == multiarch_same &&
+	if (pkgbin->multiarch == PKG_MULTIARCH_SAME &&
 	    format == PKG_INFODB_FORMAT_MULTIARCH)
 		varbuf_add_archqual(&vb, pkgbin->arch);
 	varbuf_add_char(&vb, '.');
diff --git a/src/infodb-upgrade.c b/src/infodb-upgrade.c
index 88ba4311e..052291e22 100644
--- a/src/infodb-upgrade.c
+++ b/src/infodb-upgrade.c
@@ -126,7 +126,7 @@ pkg_infodb_link_multiarch_files(void)
 		}
 
 		/* Does it need to be upgraded? */
-		if (pkg->installed.multiarch != multiarch_same)
+		if (pkg->installed.multiarch != PKG_MULTIARCH_SAME)
 			continue;
 
 		/* Skip past the full stop. */
diff --git a/src/unpack.c b/src/unpack.c
index 7928ceb92..a7bb1262f 100644
--- a/src/unpack.c
+++ b/src/unpack.c
@@ -323,8 +323,8 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
   /* If the old and new versions use a different infodb layout, get rid
    * of the files using the old layout. */
   if (pkg->installed.multiarch != pkg->available.multiarch &&
-      (pkg->installed.multiarch == multiarch_same ||
-       pkg->available.multiarch == multiarch_same)) {
+      (pkg->installed.multiarch == PKG_MULTIARCH_SAME ||
+       pkg->available.multiarch == PKG_MULTIARCH_SAME)) {
     debug(dbg_scripts,
           "process_archive remove old info files after db layout switch");
     pkg_infodb_foreach(pkg, &pkg->installed, pkg_infodb_remove_file);
@@ -1261,8 +1261,8 @@ void process_archive(const char *filename) {
         !otherpkg->clientdata->files) continue;
     /* Do not try to disappear other packages from the same set
      * if they are Multi-Arch: same */
-    if (pkg->installed.multiarch == multiarch_same &&
-        otherpkg->installed.multiarch == multiarch_same &&
+    if (pkg->installed.multiarch == PKG_MULTIARCH_SAME &&
+        otherpkg->installed.multiarch == PKG_MULTIARCH_SAME &&
         otherpkg->set == pkg->set)
       continue;
     debug(dbg_veryverbose, "process_archive checking disappearance %s",