From: Adam Heath <doogie@debian.org>
Date: Wed, 20 Dec 2000 08:47:49 +0000 (+0000)
Subject: Fix -Wall messages.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40a340714bfdd3f2066c02d53f2b7888394c5492;p=dpkg

Fix -Wall messages.
---

diff --git a/ChangeLog b/ChangeLog
index 785baf66..e682b875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 20 02:41:39 CST 2000 Adam Heath <doogie@debian.org>
+
+  * dpkg-deb/build.c, dpkg-deb/extract.c, dpkg-deb/info.c,
+    include/dpkg-db.h, lib/myopt.c, lib/parse.c, lib/varbuf.c,
+    lib/vercmp.c, main/archives.c, main/enquiry.c, main/filesdb.c,
+    main/processarc.c, po/dpkg.pot: Fix -Wall messages.
+
 Wed Dec 20 02:21:43 CST 2000 Adam Heath <doogie@debian.org>
 
   * include/dpkg.h.in: Make {stream,fd}_null_copy use [lf]seek, and fall
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index 00a774d8..8e1c41c8 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -214,8 +214,6 @@ void do_build(const char *const *argv) {
   char conffilename[MAXCONFFILENAME+1];
   time_t thetime= 0;
   struct _finfo *fi;
-  struct _finfo *nosymlist = NULL;
-  struct _finfo *nosymlist_end = NULL;
   struct _finfo *symlist = NULL;
   struct _finfo *symlist_end = NULL;
   
@@ -451,7 +449,6 @@ void do_build(const char *const *argv) {
   close(p2[1]);
   /* Of course we should not forget to compress the archive as well.. */
   if (!(c2= m_fork())) {
-    char *combuf;
     close(p1[1]);
     m_dup2(p2[0],0); close(p2[0]);
     m_dup2(oldformatflag ? fileno(ar) : gzfd,1);
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index 6ef82153..f32ecb34 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -94,12 +94,11 @@ void extracthalf(const char *debar, const char *directory,
   char nlc;
   char *cur;
   struct ar_hdr arh;
-  int readfromfd, oldformat, header_done, adminmember, c;
+  int readfromfd, oldformat, header_done, adminmember;
 #if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ > 0)
   fpos_t fpos;
 #endif
 #ifdef USE_ZLIB
-  z_streamp gzstream = NULL;
   gzFile gzfile;
   char gzbuffer[4096];
   int gzactualread;
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index 5c8b6ac2..7e72fc53 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -84,7 +84,6 @@ static void info_spew(const char *debar, const char *directory,
                       const char *const *argv) {
   const char *component;
   FILE *co;
-  pid_t c1;
   int re= 0;
 
   while ((component= *argv++) != 0) {
diff --git a/include/dpkg-db.h b/include/dpkg-db.h
index b800945f..59fc76ef 100644
--- a/include/dpkg-db.h
+++ b/include/dpkg-db.h
@@ -285,6 +285,7 @@ void writedb(const char *filename, int available, int mustsync);
 void varbufrecord(struct varbuf*, const struct pkginfo*, const struct pkginfoperfile*);
 void varbufdependency(struct varbuf *vb, struct dependency *dep);
 void varbufprintf(struct varbuf *v, const char *fmt, ...) PRINTFFORMAT(2,3);
+void varbufvprintf(struct varbuf *v, const char *fmt, va_list va);
   /* NB THE VARBUF MUST HAVE BEEN INITIALISED AND WILL NOT BE NULL-TERMINATED */
 
 /*** from vercmp.c ***/
diff --git a/lib/myopt.c b/lib/myopt.c
index 90e66284..8d4991ad 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -22,6 +22,7 @@
 
 #include <string.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include <config.h>
 #include <myopt.h>
diff --git a/lib/parse.c b/lib/parse.c
index 8d163e60..eee94867 100644
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -85,7 +85,7 @@ int parsedb(const char *filename, enum parsedbflags flags,
   const struct fieldinfo *fip;
   const struct nickname *nick;
   const char *fieldname;
-  int *ip, i, c;
+  int *ip, c;
 
   if (warncount) *warncount= 0;
   newpifp= (flags & pdb_recordavailable) ? &newpig.available : &newpig.installed;
diff --git a/lib/varbuf.c b/lib/varbuf.c
index a05ad7ab..0c8f1770 100644
--- a/lib/varbuf.c
+++ b/lib/varbuf.c
@@ -49,7 +49,7 @@ void varbufprintf(struct varbuf *v, const char *fmt, ...) {
   } while (r >= v->size-ou-1);
 }
 
-void varbufvprintf(struct varbuf *v, char *fmt, va_list va) {
+void varbufvprintf(struct varbuf *v, const char *fmt, va_list va) {
   int ou, r;
   va_list al;
 
diff --git a/lib/vercmp.c b/lib/vercmp.c
index fecc7456..b82ef0bc 100644
--- a/lib/vercmp.c
+++ b/lib/vercmp.c
@@ -85,6 +85,7 @@ int versionsatisfied3(const struct versionrevision *it,
   case dvr_exact:          return r == 0;
   default:                 internerr("unknown verrel");
   }
+  return 0;
 }
 
 int versionsatisfied(struct pkginfoperfile *it, struct deppossi *against) {
diff --git a/main/archives.c b/main/archives.c
index 9b1a15a1..73e8a244 100644
--- a/main/archives.c
+++ b/main/archives.c
@@ -216,8 +216,6 @@ int tarobject(struct TarInfo *ti) {
   struct tarcontext *tc= (struct tarcontext*)ti->UserData;
   int statr, fd, r, i, existingdirectory;
   struct stat stab, stabd;
-  size_t sz, wsz;
-  int thefile;
   char databuf[TARBLKSZ];
   struct fileinlist *nifd;
   struct pkginfo *divpkg, *otherpkg;
diff --git a/main/enquiry.c b/main/enquiry.c
index b3476419..857caff3 100644
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -262,6 +262,7 @@ static int yettobeunpacked(struct pkginfo *pkg, const char **thissect) {
   default:
     internerr("unknown status checking for unpackedness");
   }
+  return 0;
 }
 
 void unpackchk(const char *const *argv) {
@@ -666,7 +667,7 @@ void printarch(const char *const *argv) {
   }, *archp;
                   
   const char *ccompiler, *arch;
-  int p1[2], c;
+  int p1[2];
   pid_t c1;
   FILE *ccpipe;
   struct varbuf vb;
diff --git a/main/filesdb.c b/main/filesdb.c
index 49147619..0180d35a 100644
--- a/main/filesdb.c
+++ b/main/filesdb.c
@@ -71,7 +71,6 @@ void ensure_packagefiles_available(struct pkginfo *pkg) {
   int search, findlast, putat;
   struct stat stat_buf;
   char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr;
-  ssize_t bytes;
 
   if (pkg->clientdata && pkg->clientdata->fileslistvalid) return;
   ensure_package_clientdata(pkg);
@@ -314,7 +313,6 @@ void ensure_statoverrides(void) {
   struct stat stab1, stab2;
   FILE *file;
   char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr;
-  ssize_t bytes;
   struct filestatoverride *fso;
   struct filenamenode *fnn;
 
@@ -684,6 +682,7 @@ struct filenamenode *findnamenode(const char *name, enum fnnflags flags) {
   default:
     internerr("findnamenode no f_largemem");
   }
+  return NULL;
 }
 
 /*** Code for low-memory-footprint in-core files database ***/
diff --git a/main/processarc.c b/main/processarc.c
index 95d18d6a..5a6df191 100644
--- a/main/processarc.c
+++ b/main/processarc.c
@@ -77,7 +77,7 @@ void process_archive(const char *filename) {
   struct dependency *dsearch, *newdeplist, **newdeplistlastp;
   struct dependency *newdep, *dep, *providecheck;
   struct deppossi *psearch, **newpossilastp, *possi, *newpossi, *pdep;
-  FILE *conff, *tmpf;
+  FILE *conff;
   DIR *dsd;
   struct filenamenode *namenode;
   struct dirent *de;
diff --git a/po/dpkg.pot b/po/dpkg.pot
index cd31fa20..79cb647a 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-20 01:38-0600\n"
+"POT-Creation-Date: 2000-12-20 02:40-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -502,62 +502,62 @@ msgstr ""
 msgid "failed in do_fd_read on read (%s)"
 msgstr ""
 
-#: lib/myopt.c:38
+#: lib/myopt.c:39
 #, c-format
 msgid "failed to open configuration file `%.255s' for reading"
 msgstr ""
 
-#: lib/myopt.c:70
+#: lib/myopt.c:71
 #, c-format
 msgid "configuration error: unknown option %s"
 msgstr ""
 
-#: lib/myopt.c:73
+#: lib/myopt.c:74
 #, c-format
 msgid "configuration error: %s needs a value"
 msgstr ""
 
-#: lib/myopt.c:77
+#: lib/myopt.c:78
 #, c-format
 msgid "configuration error: %s does not take a value"
 msgstr ""
 
-#: lib/myopt.c:82
+#: lib/myopt.c:83
 #, c-format
 msgid "read error in configuration file `%.255s'"
 msgstr ""
 
-#: lib/myopt.c:83
+#: lib/myopt.c:84
 #, c-format
 msgid "error closing configuration file `%.255s'"
 msgstr ""
 
-#: lib/myopt.c:106
+#: lib/myopt.c:107
 #, c-format
 msgid "unknown option --%s"
 msgstr ""
 
-#: lib/myopt.c:110
+#: lib/myopt.c:111
 #, c-format
 msgid "--%s option takes a value"
 msgstr ""
 
-#: lib/myopt.c:115
+#: lib/myopt.c:116
 #, c-format
 msgid "--%s option does not take a value"
 msgstr ""
 
-#: lib/myopt.c:122
+#: lib/myopt.c:123
 #, c-format
 msgid "unknown option -%c"
 msgstr ""
 
-#: lib/myopt.c:127
+#: lib/myopt.c:128
 #, c-format
 msgid "-%c option takes a value"
 msgstr ""
 
-#: lib/myopt.c:135
+#: lib/myopt.c:136
 #, c-format
 msgid "-%c option does not take a value"
 msgstr ""
@@ -735,61 +735,61 @@ msgstr ""
 msgid "error setting timestamps of `%.255s'"
 msgstr ""
 
-#: main/archives.c:166 main/archives.c:410
+#: main/archives.c:166 main/archives.c:408
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: main/archives.c:168 main/archives.c:413
+#: main/archives.c:168 main/archives.c:411
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
 
-#: main/archives.c:250
+#: main/archives.c:248
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of "
 "`%.250s'%.10s%.100s%.10s"
 msgstr ""
 
-#: main/archives.c:254
+#: main/archives.c:252
 msgid " (package: "
 msgstr ""
 
-#: main/archives.c:276
+#: main/archives.c:274
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 
-#: main/archives.c:284
+#: main/archives.c:282
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr ""
 
-#: main/archives.c:290
+#: main/archives.c:288
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 
-#: main/archives.c:322
+#: main/archives.c:320
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: main/archives.c:353
+#: main/archives.c:351
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr ""
 
-#: main/archives.c:357
+#: main/archives.c:355
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 
-#: main/archives.c:367
+#: main/archives.c:365
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
@@ -797,208 +797,208 @@ msgstr ""
 #. Now that we have verified everything its time to actually
 #. * build something. Lets start by making the ar-wrapper.
 #.
-#: dpkg-deb/build.c:367 main/archives.c:395
+#: dpkg-deb/build.c:365 main/archives.c:393
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
 
-#: main/archives.c:399
+#: main/archives.c:397
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: main/archives.c:416
+#: main/archives.c:414
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
 
-#: main/archives.c:421
+#: main/archives.c:419
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr ""
 
-#: main/archives.c:427
+#: main/archives.c:425
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr ""
 
-#: main/archives.c:436
+#: main/archives.c:434
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: main/archives.c:443
+#: main/archives.c:441
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
 
-#: main/archives.c:452
+#: main/archives.c:450
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: main/archives.c:457
+#: main/archives.c:455
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: main/archives.c:492
+#: main/archives.c:490
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: main/archives.c:501
+#: main/archives.c:499
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: main/archives.c:505
+#: main/archives.c:503
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: main/archives.c:511
+#: main/archives.c:509
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: main/archives.c:515
+#: main/archives.c:513
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: main/archives.c:521
+#: main/archives.c:519
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: main/archives.c:535
+#: main/archives.c:533
 #, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
 "%s"
 msgstr ""
 
-#: main/archives.c:542
+#: main/archives.c:540
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
 " package %s, to enable removal of %s.\n"
 msgstr ""
 
-#: main/archives.c:546
+#: main/archives.c:544
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable removal of %s.\n"
 msgstr ""
 
-#: main/archives.c:559
+#: main/archives.c:557
 #, c-format
 msgid ""
 "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: main/archives.c:593
+#: main/archives.c:591
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: main/archives.c:597
+#: main/archives.c:595
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: main/archives.c:624
+#: main/archives.c:622
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: main/archives.c:639
+#: main/archives.c:637
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "request.\n"
 msgstr ""
 
-#: main/archives.c:642
+#: main/archives.c:640
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: main/archives.c:655
+#: main/archives.c:653
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: main/archives.c:663
+#: main/archives.c:661
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: main/archives.c:666
+#: main/archives.c:664
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: main/archives.c:667
+#: main/archives.c:665
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr ""
 
-#: main/archives.c:710
+#: main/archives.c:708
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: main/archives.c:739
+#: main/archives.c:737
 msgid "failed to exec find for --recursive"
 msgstr ""
 
-#: main/archives.c:744
+#: main/archives.c:742
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: main/archives.c:750
+#: main/archives.c:748
 msgid "error reading find's pipe"
 msgstr ""
 
-#: main/archives.c:751
+#: main/archives.c:749
 msgid "error closing find's pipe"
 msgstr ""
 
-#: main/archives.c:755
+#: main/archives.c:753
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: main/archives.c:771
+#: main/archives.c:769
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: main/archives.c:837
+#: main/archives.c:835
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr ""
 
-#: main/archives.c:842
+#: main/archives.c:840
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr ""
 
-#: main/archives.c:856
+#: main/archives.c:854
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: main/archives.c:868
+#: main/archives.c:866
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 
-#: main/archives.c:874
+#: main/archives.c:872
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1503,188 +1503,188 @@ msgstr ""
 msgid "<unknown>"
 msgstr ""
 
-#: main/enquiry.c:276
+#: main/enquiry.c:277
 msgid "--yet-to-unpack does not take any arguments"
 msgstr ""
 
-#: main/enquiry.c:314
+#: main/enquiry.c:315
 #, c-format
 msgid " %d in %s: "
 msgstr ""
 
-#: main/enquiry.c:329
+#: main/enquiry.c:330
 #, c-format
 msgid " %d packages, from the following sections:"
 msgstr ""
 
-#: main/enquiry.c:349
+#: main/enquiry.c:350
 #, c-format
 msgid "diversion by %s"
 msgstr ""
 
-#: main/enquiry.c:350
+#: main/enquiry.c:351
 msgid "local diversion"
 msgstr ""
 
-#: main/enquiry.c:351
+#: main/enquiry.c:352
 msgid "to"
 msgstr ""
 
-#: main/enquiry.c:351
+#: main/enquiry.c:352
 msgid "from"
 msgstr ""
 
-#: main/enquiry.c:384
+#: main/enquiry.c:385
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 
-#: main/enquiry.c:412
+#: main/enquiry.c:413
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr ""
 
-#: main/enquiry.c:428 main/packages.c:109
+#: main/enquiry.c:429 main/packages.c:109
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr ""
 
-#: main/enquiry.c:448
+#: main/enquiry.c:449
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 
-#: main/enquiry.c:457
+#: main/enquiry.c:458
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr ""
 
-#: main/enquiry.c:467
+#: main/enquiry.c:468
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr ""
 
-#: main/enquiry.c:476
+#: main/enquiry.c:477
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr ""
 
-#: main/enquiry.c:482
+#: main/enquiry.c:483
 msgid "locally diverted"
 msgstr ""
 
-#: main/enquiry.c:483
+#: main/enquiry.c:484
 msgid "package diverts others"
 msgstr ""
 
-#: main/enquiry.c:484
+#: main/enquiry.c:485
 #, c-format
 msgid "diverted by %s"
 msgstr ""
 
-#: main/enquiry.c:485
+#: main/enquiry.c:486
 #, c-format
 msgid " to: %s\n"
 msgstr ""
 
-#: main/enquiry.c:503
+#: main/enquiry.c:504
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents."
 msgstr ""
 
-#: main/enquiry.c:514
+#: main/enquiry.c:515
 msgid "--assert-* does not take any arguments"
 msgstr ""
 
-#: main/enquiry.c:529
+#: main/enquiry.c:530
 msgid ""
 "Version of dpkg with working epoch support not yet configured.\n"
 " Please use `dpkg --configure dpkg', and then try again.\n"
 msgstr ""
 
-#: main/enquiry.c:533
+#: main/enquiry.c:534
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
 msgstr ""
 
-#: main/enquiry.c:576
+#: main/enquiry.c:577
 msgid "--predep-package does not take any argument"
 msgstr ""
 
-#: main/enquiry.c:628
+#: main/enquiry.c:629
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
 msgstr ""
 
-#: main/enquiry.c:629
+#: main/enquiry.c:630
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: main/enquiry.c:649
+#: main/enquiry.c:650
 #, c-format
 msgid ""
 "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
 " `%s'\n"
 msgstr ""
 
-#: main/enquiry.c:652
+#: main/enquiry.c:653
 #, c-format
 msgid "compiler libgcc filename not understood: %.250s"
 msgstr ""
 
-#: main/enquiry.c:656
+#: main/enquiry.c:657
 msgid "--print-installation-architecture does not take any argument"
 msgstr ""
 
-#: main/enquiry.c:676
+#: main/enquiry.c:677
 msgid "--print-architecture does not take any argument"
 msgstr ""
 
-#: main/enquiry.c:682
+#: main/enquiry.c:683
 msgid "failed to fdopen CC pipe"
 msgstr ""
 
-#: main/enquiry.c:700
+#: main/enquiry.c:701
 msgid "error reading from CC pipe"
 msgstr ""
 
-#: main/enquiry.c:702
+#: main/enquiry.c:703
 msgid "empty output"
 msgstr ""
 
-#: main/enquiry.c:704
+#: main/enquiry.c:705
 msgid "no newline"
 msgstr ""
 
-#: main/enquiry.c:707
+#: main/enquiry.c:708
 msgid "no gcc-lib component"
 msgstr ""
 
-#: main/enquiry.c:709
+#: main/enquiry.c:710
 msgid "no slash after gcc-lib"
 msgstr ""
 
-#: main/enquiry.c:721
+#: main/enquiry.c:722
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
 msgstr ""
 
-#: main/enquiry.c:763
+#: main/enquiry.c:764
 msgid "--cmpversions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
-#: main/enquiry.c:768
+#: main/enquiry.c:769
 msgid "--cmpversions bad relation"
 msgstr ""
 
-#: main/enquiry.c:773
+#: main/enquiry.c:774
 #, c-format
 msgid "version a has bad syntax: %s\n"
 msgstr ""
 
-#: main/enquiry.c:783
+#: main/enquiry.c:784
 #, c-format
 msgid "version b has bad syntax: %s\n"
 msgstr ""
@@ -1730,156 +1730,156 @@ msgid ""
 " "
 msgstr ""
 
-#: main/filesdb.c:130
+#: main/filesdb.c:129
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:135
+#: main/filesdb.c:134
 #, c-format
 msgid ""
 "dpkg: serious warning: files list file for package `%.250s' missing, "
 "assuming package has no files currently installed.\n"
 msgstr ""
 
-#: main/filesdb.c:150
+#: main/filesdb.c:149
 #, c-format
 msgid "files list for package `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:163
+#: main/filesdb.c:162
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 
-#: main/filesdb.c:174
+#: main/filesdb.c:173
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:176
+#: main/filesdb.c:175
 #, c-format
 msgid "files list file for package `%.250s' is truncated"
 msgstr ""
 
-#: main/filesdb.c:207
+#: main/filesdb.c:206
 msgid "(Reading database ... "
 msgstr ""
 
-#: main/filesdb.c:207
+#: main/filesdb.c:206
 msgid "(Scanning database ... "
 msgstr ""
 
-#: main/filesdb.c:215
+#: main/filesdb.c:214
 #, c-format
 msgid "%d files and directories currently installed.)\n"
 msgstr ""
 
-#: main/filesdb.c:246
+#: main/filesdb.c:245
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:256
+#: main/filesdb.c:255
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:258
+#: main/filesdb.c:257
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:260
+#: main/filesdb.c:259
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:263
+#: main/filesdb.c:262
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:265
+#: main/filesdb.c:264
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:330
+#: main/filesdb.c:328
 msgid "failed to open statoverride file"
 msgstr ""
 
-#: main/filesdb.c:334
+#: main/filesdb.c:332
 msgid "failed to fstat statoverride file"
 msgstr ""
 
-#: main/filesdb.c:337
+#: main/filesdb.c:335
 msgid "failed to fstat previous statoverride file"
 msgstr ""
 
-#: main/filesdb.c:349
+#: main/filesdb.c:347
 #, c-format
 msgid "statoverride file `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:362
+#: main/filesdb.c:360
 msgid "statoverride file contains empty line"
 msgstr ""
 
-#: main/filesdb.c:447
+#: main/filesdb.c:445
 msgid "failed to open diversions file"
 msgstr ""
 
-#: main/filesdb.c:451
+#: main/filesdb.c:449
 msgid "failed to fstat previous diversions file"
 msgstr ""
 
-#: main/filesdb.c:453
+#: main/filesdb.c:451
 msgid "failed to fstat diversions file"
 msgstr ""
 
-#: main/filesdb.c:475
+#: main/filesdb.c:473
 msgid "fgets gave an empty string from diversions [i]"
 msgstr ""
 
-#: main/filesdb.c:476
+#: main/filesdb.c:474
 msgid "diversions file has too-long line or EOF [i]"
 msgstr ""
 
-#: main/filesdb.c:482
+#: main/filesdb.c:480
 msgid "read error in diversions [ii]"
 msgstr ""
 
-#: main/filesdb.c:483
+#: main/filesdb.c:481
 msgid "unexpected EOF in diversions [ii]"
 msgstr ""
 
-#: main/filesdb.c:486
+#: main/filesdb.c:484
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr ""
 
-#: main/filesdb.c:487 main/filesdb.c:498
+#: main/filesdb.c:485 main/filesdb.c:496
 msgid "diversions file has too-long line or EOF [ii]"
 msgstr ""
 
-#: main/filesdb.c:493
+#: main/filesdb.c:491
 msgid "read error in diversions [iii]"
 msgstr ""
 
-#: main/filesdb.c:494
+#: main/filesdb.c:492
 msgid "unexpected EOF in diversions [iii]"
 msgstr ""
 
-#: main/filesdb.c:497
+#: main/filesdb.c:495
 msgid "fgets gave an empty string from diversions [iii]"
 msgstr ""
 
-#: main/filesdb.c:505
+#: main/filesdb.c:503
 #, c-format
 msgid "conflicting diversions involving `%.250s' or `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:514
+#: main/filesdb.c:512
 msgid "read error in diversions [i]"
 msgstr ""
 
@@ -2671,190 +2671,190 @@ msgid "%s: failed to exec gzip %s"
 msgstr ""
 
 #. Decode our arguments
-#: dpkg-deb/build.c:223
+#: dpkg-deb/build.c:221
 msgid "--build needs a directory argument"
 msgstr ""
 
-#: dpkg-deb/build.c:232
+#: dpkg-deb/build.c:230
 msgid "--build takes at most two arguments"
 msgstr ""
 
-#: dpkg-deb/build.c:236
+#: dpkg-deb/build.c:234
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c:251
+#: dpkg-deb/build.c:249
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 
-#: dpkg-deb/build.c:252
+#: dpkg-deb/build.c:250
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
 "dpkg-deb: building an unknown package in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:270
+#: dpkg-deb/build.c:268
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 
-#: dpkg-deb/build.c:272
+#: dpkg-deb/build.c:270
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr ""
 
-#: dpkg-deb/build.c:277
+#: dpkg-deb/build.c:275
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr ""
 
-#: dpkg-deb/build.c:283
+#: dpkg-deb/build.c:281
 #, c-format
 msgid "%d errors in control file"
 msgstr ""
 
-#: dpkg-deb/build.c:294
+#: dpkg-deb/build.c:292
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:300
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:313
+#: dpkg-deb/build.c:311
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 
-#: dpkg-deb/build.c:315
+#: dpkg-deb/build.c:313
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:319
+#: dpkg-deb/build.c:317
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:329
+#: dpkg-deb/build.c:327
 msgid "empty string from fgets reading conffiles"
 msgstr ""
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:329
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
 
-#: dpkg-deb/build.c:343
+#: dpkg-deb/build.c:341
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr ""
 
-#: dpkg-deb/build.c:345
+#: dpkg-deb/build.c:343
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:347
+#: dpkg-deb/build.c:345
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr ""
 
-#: dpkg-deb/build.c:352
+#: dpkg-deb/build.c:350
 msgid "error reading conffiles file"
 msgstr ""
 
-#: dpkg-deb/build.c:355
+#: dpkg-deb/build.c:353
 msgid "error opening conffiles file"
 msgstr ""
 
-#: dpkg-deb/build.c:358
+#: dpkg-deb/build.c:356
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr ""
 
-#: dpkg-deb/build.c:368
+#: dpkg-deb/build.c:366
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:373 dpkg-deb/build.c:446 dpkg-deb/build.c:468
+#: dpkg-deb/build.c:371 dpkg-deb/build.c:444 dpkg-deb/build.c:465
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:374
+#: dpkg-deb/build.c:372
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:375 dpkg-deb/build.c:448
+#: dpkg-deb/build.c:373 dpkg-deb/build.c:446
 msgid "failed to exec tar -cf"
 msgstr ""
 
 #. Create a temporary file to store the control data in. Immediately unlink
 #. * our temporary file so others can't mess with it.
 #.
-#: dpkg-deb/build.c:381
+#: dpkg-deb/build.c:379
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:382
+#: dpkg-deb/build.c:380
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr ""
 
 #. make sure it's gone, the fd will remain until we close it
-#: dpkg-deb/build.c:385
+#: dpkg-deb/build.c:383
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:393 dpkg-deb/build.c:422 dpkg-deb/build.c:458
+#: dpkg-deb/build.c:391 dpkg-deb/build.c:420 dpkg-deb/build.c:455
 msgid "control"
 msgstr ""
 
-#: dpkg-deb/build.c:398
+#: dpkg-deb/build.c:396
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:421
+#: dpkg-deb/build.c:419
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:429
+#: dpkg-deb/build.c:427
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:430
+#: dpkg-deb/build.c:428
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr ""
 
 #. make sure it's gone, the fd will remain until we close it
-#: dpkg-deb/build.c:433
+#: dpkg-deb/build.c:431
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:470
+#: dpkg-deb/build.c:467
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:481 dpkg-deb/build.c:488
+#: dpkg-deb/build.c:478 dpkg-deb/build.c:485
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:505
+#: dpkg-deb/build.c:502
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:506
+#: dpkg-deb/build.c:503
 msgid "cat (data)"
 msgstr ""
 
@@ -2882,51 +2882,51 @@ msgstr ""
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:108
+#: dpkg-deb/extract.c:107
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:109
+#: dpkg-deb/extract.c:108
 msgid "failed to fstat archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:110
+#: dpkg-deb/extract.c:109
 msgid "version number"
 msgstr ""
 
-#: dpkg-deb/extract.c:119
+#: dpkg-deb/extract.c:118
 msgid "between members"
 msgstr ""
 
-#: dpkg-deb/extract.c:121 split/info.c:94
+#: dpkg-deb/extract.c:120 split/info.c:94
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
 msgstr ""
 
-#: dpkg-deb/extract.c:125
+#: dpkg-deb/extract.c:124
 #, c-format
 msgid "file `%.250s' is corrupt - negative member length %ld"
 msgstr ""
 
-#: dpkg-deb/extract.c:129
+#: dpkg-deb/extract.c:128
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 
-#: dpkg-deb/extract.c:132
+#: dpkg-deb/extract.c:131
 msgid "header info member"
 msgstr ""
 
-#: dpkg-deb/extract.c:135
+#: dpkg-deb/extract.c:134
 msgid "archive has no newlines in header"
 msgstr ""
 
-#: dpkg-deb/extract.c:138
+#: dpkg-deb/extract.c:137
 msgid "archive has no dot in version number"
 msgstr ""
 
-#: dpkg-deb/extract.c:141
+#: dpkg-deb/extract.c:140
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
@@ -2934,134 +2934,134 @@ msgstr ""
 #. Members with `_' are noncritical, and if we don't understand them
 #. * we skip them.
 #.
-#: dpkg-deb/extract.c:150 dpkg-deb/extract.c:168
+#: dpkg-deb/extract.c:149 dpkg-deb/extract.c:167
 #, c-format
 msgid "skipped member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:159
+#: dpkg-deb/extract.c:158
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:164
+#: dpkg-deb/extract.c:163
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:176
+#: dpkg-deb/extract.c:175
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %ld bytes: control archive= %ld bytes.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:188
+#: dpkg-deb/extract.c:187
 msgid "ctrl information length"
 msgstr ""
 
-#: dpkg-deb/extract.c:190
+#: dpkg-deb/extract.c:189
 #, c-format
 msgid "archive has malformatted ctrl len `%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:193
+#: dpkg-deb/extract.c:192
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %ld bytes: control archive= %ld, main archive= %ld.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:202
+#: dpkg-deb/extract.c:201
 msgid "ctrlarea"
 msgstr ""
 
-#: dpkg-deb/extract.c:208
+#: dpkg-deb/extract.c:207
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
 "dpkg-deb:    corrupted by being downloaded in ASCII mode\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:212
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:218
+#: dpkg-deb/extract.c:217
 msgid "fgetpos failed"
 msgstr ""
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:221
 msgid "fsetpos failed"
 msgstr ""
 
-#: dpkg-deb/extract.c:229
+#: dpkg-deb/extract.c:228
 msgid "failed to fdopen p1 in paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:231
+#: dpkg-deb/extract.c:230
 msgid "failed to write to gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:232
+#: dpkg-deb/extract.c:231
 msgid "failed to close gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:239
+#: dpkg-deb/extract.c:238
 msgid "failed to syscall lseek to files archive portion"
 msgstr ""
 
-#: dpkg-deb/extract.c:247
+#: dpkg-deb/extract.c:246
 msgid "failed to write to pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:248
+#: dpkg-deb/extract.c:247
 msgid "failed to close pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:271
+#: dpkg-deb/extract.c:270
 #, c-format
 msgid "internal gzip error: `%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:277
+#: dpkg-deb/extract.c:276
 msgid "failed to exec gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:286
+#: dpkg-deb/extract.c:285
 msgid "failed to create directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:287
+#: dpkg-deb/extract.c:286
 msgid "failed to chdir to directory after creating it"
 msgstr ""
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:288
 msgid "failed to chdir to directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:303
+#: dpkg-deb/extract.c:302
 msgid "failed to exec tar"
 msgstr ""
 
-#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:66
+#: dpkg-deb/extract.c:325 dpkg-deb/extract.c:340 dpkg-deb/info.c:66
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:329
+#: dpkg-deb/extract.c:328
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:332
+#: dpkg-deb/extract.c:331
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:343
+#: dpkg-deb/extract.c:342
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
@@ -3091,72 +3091,72 @@ msgstr ""
 msgid "failed to exec rm -rf"
 msgstr ""
 
-#: dpkg-deb/info.c:93
+#: dpkg-deb/info.c:92
 msgid "info_spew"
 msgstr ""
 
-#: dpkg-deb/info.c:95
+#: dpkg-deb/info.c:94
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:99
+#: dpkg-deb/info.c:98
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:103
+#: dpkg-deb/info.c:102
 msgid "at least one requested control component missing"
 msgstr ""
 
-#: dpkg-deb/info.c:116
+#: dpkg-deb/info.c:115
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:121
+#: dpkg-deb/info.c:120
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:123
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:138
+#: dpkg-deb/info.c:137
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:140
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:147
+#: dpkg-deb/info.c:146
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:152
+#: dpkg-deb/info.c:151
 #, c-format
 msgid "failed to read `control' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:153
+#: dpkg-deb/info.c:152
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:173
+#: dpkg-deb/info.c:172
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:203
+#: dpkg-deb/info.c:202
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:235
+#: dpkg-deb/info.c:234
 msgid "--contents takes exactly one argument"
 msgstr ""