浏览代码

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.

Adam Heath 25 年之前
父节点
当前提交
647d79b9e0
共有 10 个文件被更改,包括 20 次插入10 次删除
  1. 10 0
      ChangeLog
  2. 1 1
      dpkg-deb/extract.c
  3. 1 1
      include/dpkg.h.in
  4. 2 2
      lib/mlib.c
  5. 1 1
      main/enquiry.c
  6. 1 1
      main/filesdb.c
  7. 1 1
      main/packages.c
  8. 1 1
      main/remove.c
  9. 1 1
      po/dpkg.pot
  10. 1 1
      utils/start-stop-daemon.c

+ 10 - 0
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:

+ 1 - 1
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

+ 1 - 1
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;

+ 2 - 2
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 };

+ 1 - 1
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;

+ 1 - 1
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) {

+ 1 - 1
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();
 

+ 1 - 1
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;

+ 1 - 1
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"

+ 1 - 1
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;