diff options
| author | Guillem Jover <guillem@debian.org> | 2011-01-29 05:59:09 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2011-01-31 06:30:23 +0100 |
| commit | df219a607282614168b6d19423d57bb902021f34 (patch) | |
| tree | aaa32c31ab9639c15a1713868ac1bf9db6b76f48 /lib | |
| parent | 44e022a801e0b5720a6e8d6887788ebf15b9995f (diff) | |
| download | dpkg-df219a607282614168b6d19423d57bb902021f34.tar.gz | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dpkg/database.c | 2 | ||||
| -rw-r--r-- | lib/dpkg/dpkg-db.h | 2 | ||||
| -rw-r--r-- | lib/dpkg/parse.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/dpkg/database.c b/lib/dpkg/database.c index e276c3078..dc6fd874b 100644 --- a/lib/dpkg/database.c +++ b/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; diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index 59466d9ca..a05534f93 100644 --- a/lib/dpkg/dpkg-db.h +++ b/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; diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 039f00b8d..b2bc6ca67 100644 --- a/lib/dpkg/parse.c +++ b/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 |