Clean up a few gcc warnings. Note that the warning:

  "deprecated conversion from string constant to `char *'"
is actually a bug in ncurses-dev(which has been filed as 80410) not setting
the fmt argument as const.

diff --git a/ChangeLog b/ChangeLog
index ffbfd0f1e7fea1983c0139fe1e9797dd237efb19..f69eb2561931cef701db76d35cd3967c75dab2f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Dec 23 21:20:43 CST 2000 Adam Heath <doogie@debian.org>
+
+  * dpkg-deb/extract.c, include/dpkg.h.in, lib/mlib.c,
+    main/enquiry.c, main/filesdb.c, main/packages.c, main/remove.c,
+    utils/start-stop-daemon.c: Clean up a few gcc warnings.  Note,
+    that the warning:
+      "deprecated conversion from string constant to `char *'"
+    is actually a bug in ncurses-dev(which has been filed as 80410)
+    not setting the fmt argument as const.
+
 Sat Dec 23 19:33:05 CST 2000 Adam Heath <doogie@debian.org>
 
   * automake/dpkg.m4, configure.in, Makefile.conf.in:

diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index f32ecb34e875781c4d2e1dd3fea0ba1ff0821619..1b8d41d489720d817c50a23e09472bc2d7c60cb4 100644 (file)
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -94,7 +94,7 @@ void extracthalf(const char *debar, const char *directory,
   char nlc;
   char *cur;
   struct ar_hdr arh;
-  int readfromfd, oldformat, header_done, adminmember;
+  int readfromfd, oldformat= 0, header_done, adminmember;
 #if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ > 0)
   fpos_t fpos;
 #endif

diff --git a/include/dpkg.h.in b/include/dpkg.h.in
index 4d929922597a2c29c87e4a862cad73e028cce797..4b1301841c98a314b4164f4cbf03400d4c410973 100644 (file)
--- a/include/dpkg.h.in
+++ b/include/dpkg.h.in
@@ -245,7 +245,7 @@ struct buffer_data {
                          limit, desc)
 ssize_t buffer_copy_setup(void *argIn, int typeIn, void *procIn,
                       void *argOut, int typeOut, void *procOut,
-                      ssize_t limit, char *desc, ...);
+                      ssize_t limit, const char *desc, ...);
 ssize_t buffer_copy(buffer_data_t read_data, buffer_data_t write_data, ssize_t limit, char *desc);
 
 extern volatile int onerr_abort;

diff --git a/lib/mlib.c b/lib/mlib.c
index 44b4faea287b57ec9c73df804f446cba24ed3409..2392b63843cb16a91d4243f446fb4364960f4efb 100644 (file)
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -129,7 +129,7 @@ ssize_t buffer_write(buffer_data_t data, void *buf, ssize_t length, char *desc)
   switch(data->type) {
     case BUFFER_WRITE_BUF:
       memcpy(data->data, buf, length);
-      data->data += length;
+      (char*)data->data += length;
       break;
     case BUFFER_WRITE_VBUF:
       varbufaddbuf((struct varbuf *)data->data, buf, length);
@@ -175,7 +175,7 @@ ssize_t buffer_read(buffer_data_t data, void *buf, ssize_t length, char *desc) {
 
 ssize_t buffer_copy_setup(void *argIn, int typeIn, void *procIn,
                       void *argOut, int typeOut, void *procOut,
-                      ssize_t limit, char *desc, ...)
+                      ssize_t limit, const char *desc, ...)
 {
   struct buffer_data read_data = { procIn, argIn, typeIn },
                     write_data = { procOut, argOut, typeOut };

diff --git a/main/enquiry.c b/main/enquiry.c
index d4705321eef0b9c891bf5412f79ffdb8915bd353..3035b8cb21034619df6fe7a4b272dee60561743e 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -666,7 +666,7 @@ void printarch(const char *const *argv) {
     { 0,0,0 }
   }, *archp;
                   
-  const char *ccompiler, *arch;
+  const char *ccompiler, *arch= NULL;
   int p1[2];
   pid_t c1;
   FILE *ccpipe;

diff --git a/main/filesdb.c b/main/filesdb.c
index 0180d35ac302b0f9b7dedc6555cb5213f7a39495..fe86f47f47728e858cc976380bc6f7ab2161104f 100644 (file)
--- a/main/filesdb.c
+++ b/main/filesdb.c
@@ -602,7 +602,7 @@ struct fileiterator *iterfilestart(void) {
 }
 
 struct filenamenode *iterfilenext(struct fileiterator *i) {
-  struct filenamenode *r;
+  struct filenamenode *r= NULL;
   switch (f_largemem) {
   case 1:
     while (!i->u.high.namenode) {

diff --git a/main/packages.c b/main/packages.c
index 0cb6aaaa3dafaa054642b50c3fcc4dc7c93c6a77..4085936f455d674172b75b8645935f1f0828ecf6 100644 (file)
--- a/main/packages.c
+++ b/main/packages.c
@@ -132,7 +132,7 @@ void process_queue(void) {
   struct pkginqueue *removeent, *rundown;
   struct pkginfo *volatile pkg;
   jmp_buf ejbuf;
-  enum istobes istobe;
+  enum istobes istobe= itb_normal;
   
   clear_istobes();
 

diff --git a/main/remove.c b/main/remove.c
index b5a0fc61a27dd233556a9180f7bf7594d01b4d97..0e6658d7101e38165fa1a496d027407e58ae44fa 100644 (file)
--- a/main/remove.c
+++ b/main/remove.c
@@ -182,7 +182,7 @@ void removal_bulk(struct pkginfo *pkg) {
 
   static struct varbuf fnvb, removevb;
   
-  int before, r, foundpostrm, removevbbase;
+  int before, r, foundpostrm= 0, removevbbase;
   int infodirbaseused, conffnameused, conffbasenamelen, pkgnameused;
   char *conffbasename;
   struct reversefilelistiter rlistit;

diff --git a/po/dpkg.pot b/po/dpkg.pot
index 8b8522cfd831b727121b6fece4d82757bee1767f..1b6432af20f787f17295c96fa5605152915854a7 100644 (file)
--- 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-23 18:54-0600\n"
+"POT-Creation-Date: 2000-12-23 20:46-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"

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 2b67b5ae1848977f442274728ab607fd2adc5ea0..7e0c6128c0f61c7b2818378c26a805096c97c6b3 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -70,7 +70,7 @@ static int runas_uid = -1;
 static int runas_gid = -1;
 static const char *userspec = NULL;
 static char *changeuser = NULL;
-static char *changegroup = NULL;
+static const char *changegroup = NULL;
 static char *changeroot = NULL;
 static const char *cmdname = NULL;
 static char *execname = NULL;