Rename architecture variables to arch

The “arch” name is unambiguous in this context, and as we are going to
be using it more often, let's avoid unnecessary typing.

dpkg-deb/build.c

@@ -371,7 +371,7 @@ pkg_get_pathname(const char *dir, struct pkginfo *pkg)
   const char *versionstring, *arch;
 
   versionstring = versiondescribe(&pkg->available.version, vdew_never);
-  arch = pkg->available.architecture;
+  arch = pkg->available.arch;
   m_asprintf(&path, "%s/%s_%s%s%s%s", dir, pkg->name, versionstring,
              arch ? "_" : "", arch ? arch : "", DEBEXT);
 

lib/dpkg/database.c

@@ -88,7 +88,7 @@ pkgbin_blank(struct pkgbin *pifp)
   pifp->depends= NULL;
   pifp->depended= NULL;
   pifp->description= pifp->maintainer= pifp->source= pifp->installedsize= pifp->bugs= pifp->origin= NULL;
-  pifp->architecture= NULL;
+  pifp->arch = NULL;
   blankversion(&pifp->version);
   pifp->conffiles= NULL;
   pifp->arbs= NULL;

lib/dpkg/dpkg-db.h

@@ -116,7 +116,7 @@ struct pkgbin {
   const char *description;
   const char *maintainer;
   const char *source;
-  const char *architecture;
+  const char *arch;
   const char *installedsize;
   const char *origin;
   const char *bugs;

lib/dpkg/parse.c

@@ -57,7 +57,7 @@ const struct fieldinfo fieldinfos[]= {
   { "Origin",           f_charfield,       w_charfield,      PKGIFPOFF(origin)        },
   { "Maintainer",       f_charfield,       w_charfield,      PKGIFPOFF(maintainer)    },
   { "Bugs",             f_charfield,       w_charfield,      PKGIFPOFF(bugs)          },
-  { "Architecture",     f_charfield,       w_charfield,      PKGIFPOFF(architecture)  },
+  { "Architecture",     f_charfield,       w_charfield,      PKGIFPOFF(arch)          },
   { "Source",           f_charfield,       w_charfield,      PKGIFPOFF(source)        },
   { "Version",          f_version,         w_version,        PKGIFPOFF(version)       },
   { "Revision",         f_revision,        w_null                                     },
@@ -169,7 +169,7 @@ pkg_parse_verify(struct parsedb_state *ps,
     parse_must_have_field(ps, pkg, pkgbin->version.version, "version");
   }
   if (ps->flags & pdb_recordavailable)
-    parse_ensure_have_field(ps, pkg, &pkgbin->architecture, "architecture");
+    parse_ensure_have_field(ps, pkg, &pkgbin->arch, "architecture");
 
   /* Check the Config-Version information:
    * If there is a Config-Version it is definitely to be used, but

src/enquiry.c

@@ -431,7 +431,7 @@ void printarch(const char *const *argv) {
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  printf("%s\n", architecture);
+  printf("%s\n", arch);
 
   m_output(stdout, _("<standard output>"));
 }

src/help.c

@@ -265,7 +265,7 @@ do_script(struct pkginfo *pkg, struct pkgbin *pif,
   pid = subproc_fork();
   if (pid == 0) {
     if (setenv("DPKG_MAINTSCRIPT_PACKAGE", pkg->name, 1) ||
-        setenv("DPKG_MAINTSCRIPT_ARCH", pif->architecture, 1) ||
+        setenv("DPKG_MAINTSCRIPT_ARCH", pif->arch, 1) ||
         setenv("DPKG_MAINTSCRIPT_NAME", cmd->argv[0], 1) ||
         setenv("DPKG_RUNNING_VERSION", PACKAGE_VERSION, 1))
       ohshite(_("unable to setenv for maintainer script"));

src/main.c

@@ -166,7 +166,7 @@ usage(const struct cmdinfo *ci, const char *value)
 }
 
 const char thisname[]= "dpkg";
-const char architecture[]= ARCHITECTURE;
+const char arch[] = ARCHITECTURE;
 const char printforhelp[]= N_(
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"

src/main.h

@@ -139,7 +139,7 @@ extern int errabort;
 extern const char *admindir;
 extern const char *instdir;
 extern struct pkg_list *ignoredependss;
-extern const char architecture[];
+extern const char arch[];
 
 struct invoke_hook {
 	struct invoke_hook *next;

src/processarc.c

@@ -282,12 +282,12 @@ void process_archive(const char *filename) {
     return;
   }
 
-  if (pkg->available.architecture && *pkg->available.architecture &&
-      strcmp(pkg->available.architecture,"all") &&
-      strcmp(pkg->available.architecture,architecture))
+  if (pkg->available.arch && *pkg->available.arch &&
+      strcmp(pkg->available.arch, "all") &&
+      strcmp(pkg->available.arch, arch))
     forcibleerr(fc_architecture,
                 _("package architecture (%s) does not match system (%s)"),
-                pkg->available.architecture,architecture);
+                pkg->available.arch, arch);
 
   for (deconpil= deconfigure;
        deconpil;
@@ -1026,7 +1026,7 @@ void process_archive(const char *filename) {
   pkg->installed.description= pkg->available.description;
   pkg->installed.maintainer= pkg->available.maintainer;
   pkg->installed.source= pkg->available.source;
-  pkg->installed.architecture= pkg->available.architecture;
+  pkg->installed.arch = pkg->available.arch;
   pkg->installed.installedsize= pkg->available.installedsize;
   pkg->installed.version= pkg->available.version;
   pkg->installed.origin = pkg->available.origin;