Bug#229766: dpkg: fix compile time warnings

[Michal Cihar <michal@cihar.com>]

Package: dpkg
Version: 1.10.15
Severity: normal
Tags: patch

Following patches fix some warnings issued by gcc, mostly on using
printf. I'm not sure if all are correct, but at least remove these
warnings :-)

    Michal Cihar


--- dpkg-1.10.18-orig/lib/mlib.c	2003-10-25 22:05:12.000000000 +0200
+++ dpkg-1.10.18/lib/mlib.c	2004-01-26 13:23:44.000000000 +0100
@@ -196,7 +196,7 @@
       break;
     case BUFFER_WRITE_FD:
       if((ret= write(data->data.i, buf, length)) < 0 && errno != EINTR)
-	ohshite(_("failed in buffer_write(fd) (%i, ret=%li %s): %s"), data->data.i, (long)ret, desc);
+	ohshite(_("failed in buffer_write(fd) (%i, ret=%li): %s"), data->data.i, (long)ret, desc);
       break;
     case BUFFER_WRITE_NULL:
       break;
--- dpkg-1.10.18-orig/dpkg-deb/extract.c	2003-10-25 22:03:20.000000000 +0200
+++ dpkg-1.10.18/dpkg-deb/extract.c	2004-01-26 14:50:01.000000000 +0100
@@ -191,7 +191,7 @@
 
     if (admininfo >= 2)
       if (printf(_(" old debian package, version %s.\n"
-                 " size %ld bytes: control archive= %ld, main archive= %zi.\n"),
+                 " size %ld bytes: control archive= %zi, main archive= %ld.\n"),
                  versionbuf, (long)stab.st_size, ctrllennum,
                  (long) (stab.st_size - ctrllennum - strlen(ctrllenbuf) - l)) == EOF ||
           fflush(stdout)) werr("stdout");
--- dpkg-1.10.18-orig/split/info.c	2003-10-25 22:03:21.000000000 +0200
+++ dpkg-1.10.18/split/info.c	2004-01-26 14:59:00.000000000 +0100
@@ -193,9 +193,9 @@
          "        ... length:                 %lu bytes\n"
          "        ... split every:            %lu bytes\n"
          "    Part number:                    %d/%d\n"
-         "    Part length:                    %lu bytes\n"
+         "    Part length:                    %zi bytes\n"
          "    Part offset:                    %lu bytes\n"
-         "    Part file size (used portion):  %zi bytes\n\n"),
+         "    Part file size (used portion):  %lu bytes\n\n"),
          pi->filename,
          pi->fmtversion,
          pi->package,
@@ -207,7 +207,7 @@
          pi->maxpartn,
          pi->thispartlen,
          pi->thispartoffset,
-         pi->filesize);
+         (unsigned long)pi->filesize);
 }
 
 void do_info(const char *const *argv) {
--- dpkg-1.10.18-orig/split/main.c	2003-10-25 22:03:21.000000000 +0200
+++ dpkg-1.10.18/split/main.c	2004-01-26 13:31:27.000000000 +0100
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <assert.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <dpkg.h>
 #include <dpkg-db.h>