Bug#324555: defrag: FTBFS with gcc-4.0: Signedness warnings with -Werror

[Matthijs Mohlmann]

Hi,

Here is a patch that fixes the signedness errors and some other errors
encountered while fixing.

I couldn't test this patch myself because I don't have any ext2
filesystems anymore. So please test if it still works.

Regards,

Matthijs Mohlmann

#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-ftbfs-signedness.dpatch by  <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./buffers.c 
/tmp/dpep-work.2A48Xa/defrag-0.73pjm1/buffers.c
--- ./buffers.c 2001-07-04 13:08:13.000000000 +0200
+++ /tmp/dpep-work.2A48Xa/defrag-0.73pjm1/buffers.c     2005-09-04 
17:37:06.906411904 +0200
@@ -427,7 +427,7 @@
        /* Don't bother reading here if we are in readonly mode; there
           will be no need to write it back at any time. */
        if (!readonly)
-               read_current_block (source, b->data);
+               read_current_block (source, (char *) b->data);
        d2n(source) = 0;
        n2d(b->dest_zone) = 0;
        b->full = 1;
@@ -442,7 +442,7 @@
                        (unsigned long) b->dest_zone, 
                        (unsigned long) dest);
        assert (b->in_use & b->full);
-       write_current_block (dest, b->data);
+       write_current_block (dest, (char *) b->data);
        assert (!n2d(b->dest_zone));
        assert (!d2n(dest));
        d2n(dest) = b->dest_zone;
diff -urNad --exclude=CVS --exclude=.svn ./display.c 
/tmp/dpep-work.2A48Xa/defrag-0.73pjm1/display.c
--- ./display.c 2001-07-04 13:08:13.000000000 +0200
+++ /tmp/dpep-work.2A48Xa/defrag-0.73pjm1/display.c     2005-09-04 
17:38:38.431497976 +0200
@@ -46,11 +46,14 @@
 static RETSIGTYPE
 tstp_signal(int dummy)
 {
+        sigset_t newset, *newset_p;
    UNUSED(dummy);
 
    endwin();
    signal(SIGTSTP,SIG_DFL);
-   sigsetmask(0);
+        newset_p = &newset;
+        sigemptyset(newset_p);
+        sigprocmask(SIG_SETMASK, newset_p, NULL);
    /* Put us to stop */
    kill(getpid(),SIGTSTP);     
    
diff -urNad --exclude=CVS --exclude=.svn ./e2dump.c 
/tmp/dpep-work.2A48Xa/defrag-0.73pjm1/e2dump.c
--- ./e2dump.c  2001-07-04 13:08:13.000000000 +0200
+++ /tmp/dpep-work.2A48Xa/defrag-0.73pjm1/e2dump.c      2005-09-04 
17:38:53.813159608 +0200
@@ -53,7 +53,7 @@
 } *gt;
 
 #if defined(__i386__) && defined(__GNUC__)
-static inline int bit_is_set(char * bitmap,unsigned int nr) 
+static inline int bit_is_set(unsigned char * bitmap,unsigned int nr) 
 { 
        int __res; 
        __asm__ __volatile__("btl %1,%2; adcl $0,%0" 
diff -urNad --exclude=CVS --exclude=.svn ./llseek.c 
/tmp/dpep-work.2A48Xa/defrag-0.73pjm1/llseek.c
--- ./llseek.c  2001-07-04 13:08:13.000000000 +0200
+++ /tmp/dpep-work.2A48Xa/defrag-0.73pjm1/llseek.c      2005-09-04 
17:37:30.058892192 +0200
@@ -25,7 +25,7 @@
  *   o #include "llseek.h", which provides loff_t.
  */
 
-#define _LARGEFILE_SOURCE
+//#define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
 
 #include <config.h>

signature.asc
Description: OpenPGP digital signature