Several more gcc -W<foo> fixes.

diff --git a/ChangeLog b/ChangeLog
index 4ea9e23d56041490744aa9578c0ecd0490fd7d75..d0adc3fa63b856d19cea4a4e6517fab036e3ca21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun May 19 20:25:05 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * lib/showpkg.c, lib/utils.c, optlib/long-options.c, main/archives.c,
+    main/configure.c, main/main.c, main/query.c, optlib/long-options.c,
+    lib/showpkg.c, lib/utils.c: Several more gcc -W<foo> fixes.
+
 Sun May 19 18:48:39 CDT 2002 Adam Heath <doogie@debian.org>
 
   * debian/rules: Fix overzealous running of autoheader for every build.

diff --git a/lib/showpkg.c b/lib/showpkg.c
index 6f26827f4bea040ff39bcc331e5b63bd5e1699e1..329160bb8126f2a5746b34655e8892d236591d43 100644 (file)
--- a/lib/showpkg.c
+++ b/lib/showpkg.c
@@ -39,7 +39,7 @@ struct lstitem {
 };
 
 
-static struct lstitem* alloclstitem() {
+static struct lstitem* alloclstitem(void) {
        struct lstitem* buf;
 
        buf=(struct lstitem*)malloc(sizeof(struct lstitem));
@@ -185,15 +185,16 @@ struct lstitem* parseformat(const char* fmt) {
 }
 
 
-static void dumpchain(struct lstitem* head) {
-       while (head) {
-               printf("Type: %s\n", (head->type==string) ? "string" : "field");
-               printf("Width: %d\n", head->width);
-               printf("Data: %s\n", head->data);
-               printf("\n");
-               head=head->next;
-       }
-}
+#define dumpchain(head) {\
+       const struct lstitem* ptr = head;\
+       while (ptr) {\
+               printf("Type: %s\n", (ptr->type==string) ? "string" : "field");\
+               printf("Width: %d\n", ptr->width);\
+               printf("Data: %s\n", ptr->data);\
+               printf("\n");\
+               ptr=ptr->next;\
+       }\
+}\
 
 
 void show1package(const struct lstitem* head, struct pkginfo *pkg) {

diff --git a/lib/utils.c b/lib/utils.c
index 5776c22cf570002726e29ffe4d21e3e2e18f63a2..f2a6a5592262ccf8b46404867b34894db631f92a 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <dpkg.h>
 
 /* Reimplementation of the standard ctype.h is* functions. Since gettext
  * has overloaded the meaning of LC_CTYPE we can't use that to force C

diff --git a/main/archives.c b/main/archives.c
index cb6e9b7736630d31159776f6818156aa382718f7..18dcb77043683f1d8896eac79f0babb8ad529907 100644 (file)
--- a/main/archives.c
+++ b/main/archives.c
@@ -131,7 +131,7 @@ static struct obstack tar_obs;
 static int tarobs_init= 0;
 
 /* ensure the obstack is properly initialized */
-static void ensureobstackinit() {
+static void ensureobstackinit(void) {
 
   if (!tarobs_init) {
     obstack_init(&tar_obs);
@@ -140,7 +140,7 @@ static void ensureobstackinit() {
 }
 
 /* destroy the obstack */
-static void destroyobstack() {
+static void destroyobstack(void) {
   if (tarobs_init) {
     obstack_free(&tar_obs, 0);
     tarobs_init= 0;
@@ -692,7 +692,7 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg,
          (((fixbyrm->want != want_install && fixbyrm->want != want_hold) ||
            does_replace(pkg,&pkg->available,fixbyrm)) &&
           (!fixbyrm->installed.essential || fc_removeessential)))) {
-      assert(fixbyrm->clientdata->istobe == itb_normal);
+      assert(fixbyrm->clientdata->istobe == itb_normal || fixbyrm->clientdata->istobe == itb_deconfigure);
       fixbyrm->clientdata->istobe= itb_remove;
       fprintf(stderr, _("dpkg: considering removing %s in favour of %s ...\n"),
               fixbyrm->name, pkg->name);

diff --git a/main/configure.c b/main/configure.c
index 800ee438b338d2bb10ed12eeb25aa075cce4b691..970a893078ea85d99cf10639d95a2b8ebeec4e8d 100644 (file)
--- a/main/configure.c
+++ b/main/configure.c
@@ -48,7 +48,7 @@ int conffoptcells[2][2]= { CONFFOPTCELLS };
 static void md5hash(struct pkginfo *pkg, char **hashbuf, const char *fn);
 static void copyfileperm(const char* source, const char* target);
 static void showdiff(const char* old, const char* new);
-static void suspend();
+static void suspend(void);
 static enum conffopt promptconfaction(const char* cfgfile, const char* realold,
                const char* realnew, int useredited, int distedited,
                enum conffopt what);
@@ -472,7 +472,7 @@ static void showdiff(const char* old, const char* new) {
 
 /* Suspend dpkg temporarily
  */
-static void suspend() {
+static void suspend(void) {
        const char*     s;
        int             pid;
 

diff --git a/main/main.c b/main/main.c
index 7aa4317d0b3970aecb617f9d8fccc4b720665244..8feb679e20c659def1ddb81a62815c03ee55f907 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -283,7 +283,7 @@ static void setpipe(const struct cmdinfo *cip, const char *value) {
   (*lastpipe)->fd= v;
 }
 
-void setforce(const struct cmdinfo *cip, const char *value) {
+static void setforce(const struct cmdinfo *cip, const char *value) {
   const char *comma;
   size_t l;
   const struct forceinfo *fip;

diff --git a/main/query.c b/main/query.c
index c786079b820eb73ec6612571b79d6d1cd1f1eb44..ac0a309ec77bb61d26b07622c7c3ab70bff3bf2c 100644 (file)
--- a/main/query.c
+++ b/main/query.c
@@ -100,7 +100,7 @@ static void limiteddescription(struct pkginfo *pkg, int maxl,
   *pdesc_r=pdesc; *l_r=l;
 }
 
-static int getwidth() {
+static int getwidth(void) {
   int fd;
   int res;
   struct winsize ws;

diff --git a/optlib/long-options.c b/optlib/long-options.c
index 1a2de79c13fad838f172f6d2505dade482fd9d95..3cbd7b2a20e26dd768ec4a585ffc5501caeac702 100644 (file)
--- a/optlib/long-options.c
+++ b/optlib/long-options.c
@@ -44,7 +44,7 @@ parse_long_options (argc, argv, command_name, package, version, usage)
      const char *command_name;
      const char *package;
      const char *version;
-     void (*usage)();
+     void (*usage)(int);
 {
   int c;
   int saved_opterr;