Parcourir la source

Fix -Wall messages.

Adam Heath il y a 25 ans
Parent
commit
40a340714b
14 fichiers modifiés avec 248 ajouts et 245 suppressions
  1. 7 0
      ChangeLog
  2. 0 3
      dpkg-deb/build.c
  3. 1 2
      dpkg-deb/extract.c
  4. 0 1
      dpkg-deb/info.c
  5. 1 0
      include/dpkg-db.h
  6. 1 0
      lib/myopt.c
  7. 1 1
      lib/parse.c
  8. 1 1
      lib/varbuf.c
  9. 1 0
      lib/vercmp.c
  10. 0 2
      main/archives.c
  11. 2 1
      main/enquiry.c
  12. 1 2
      main/filesdb.c
  13. 1 1
      main/processarc.c
  14. 231 231
      po/dpkg.pot

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

+ 0 - 3
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);

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

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

+ 1 - 0
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 ***/

+ 1 - 0
lib/myopt.c

@@ -22,6 +22,7 @@
 
 #include <string.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include <config.h>
 #include <myopt.h>

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

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

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

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

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

+ 1 - 2
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 ***/

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

Fichier diff supprimé car celui-ci est trop grand
+ 231 - 231
po/dpkg.pot