[PATCH] Fix several gcc4 signedness warnings

Here is a patch that fixes several gcc4 warnings about different signedness,
all between char and unsigned char. I tried to keep the patch minimal
so resertod to casts in three places.

Signed-off-by: Mika Kukkonen <mikukkon@iki.fi>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/mkdelta.c b/mkdelta.c
index 1c10f1f143ea5fe202a6cf7eb3058e579ecc28c2..6470a94e527abad37cf49eccac0df1587321630b 100644 (file)
--- a/mkdelta.c
+++ b/mkdelta.c
@@ -36,10 +36,10 @@ static int replace_object(char *buf, unsigned long size, unsigned char *sha1)
        return 0;
 }
 
        return 0;
 }
 

-static void *create_object(char *buf, unsigned long len, char *hdr, int hdrlen,
-                          unsigned long *retsize)
+static void *create_object(unsigned char *buf, unsigned long len,
+                          char *hdr, int hdrlen, unsigned long *retsize)

 {
 {

-       char *compressed;
+       unsigned char *compressed;

        unsigned long size;
        z_stream stream;
 
        unsigned long size;
        z_stream stream;
 


@@ -54,7 +54,7 @@ static void *create_object(char *buf, unsigned long len, char *hdr, int hdrlen,
        stream.avail_out = size;
 
        /* First header.. */
        stream.avail_out = size;
 
        /* First header.. */

-       stream.next_in = hdr;
+       stream.next_in = (unsigned char *)hdr;

        stream.avail_in = hdrlen;
        while (deflate(&stream, 0) == Z_OK)
                /* nothing */;
        stream.avail_in = hdrlen;
        while (deflate(&stream, 0) == Z_OK)
                /* nothing */;


@@ -69,7 +69,7 @@ static void *create_object(char *buf, unsigned long len, char *hdr, int hdrlen,
        return compressed;
 }
 
        return compressed;
 }
 

-static int restore_original_object(char *buf, unsigned long len,
+static int restore_original_object(unsigned char *buf, unsigned long len,

                                   char *type, unsigned char *sha1)
 {
        char hdr[50];
                                   char *type, unsigned char *sha1)
 {
        char hdr[50];


@@ -84,7 +84,7 @@ static int restore_original_object(char *buf, unsigned long len,
        return ret;
 }
 
        return ret;
 }
 

-static void *create_delta_object(char *buf, unsigned long len,
+static void *create_delta_object(unsigned char *buf, unsigned long len,

                                 unsigned char *sha1_ref, unsigned long *size)
 {
        char hdr[50];
                                 unsigned char *sha1_ref, unsigned long *size)
 {
        char hdr[50];

diff --git a/pull.c b/pull.c
index 395ca45328d1f17c795839d3cbfd405852933f5a..e70fc02f3bf5b6c626a138d6d76d819fab76f0c8 100644 (file)
--- a/pull.c
+++ b/pull.c
@@ -49,7 +49,7 @@ static int make_sure_we_have_it(const char *what, unsigned char *sha1)
                return 0;
 
        if (get_delta) {
                return 0;
 
        if (get_delta) {

-               char delta_sha1[20];
+               unsigned char delta_sha1[20];

                status = sha1_delta_base(sha1, delta_sha1);
                if (0 < status)
                        status = make_sure_we_have_it(what, delta_sha1);
                status = sha1_delta_base(sha1, delta_sha1);
                if (0 < status)
                        status = make_sure_we_have_it(what, delta_sha1);

diff --git a/sha1_file.c b/sha1_file.c
index e648c068b558fbdbbdc866c8829af3641e2c5b60..6d6073da85d297b4b0a59c0548720b21fc23129d 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -332,7 +332,7 @@ int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void
 void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size)
 {
        int bytes = strlen(buffer) + 1;
 void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size)
 {
        int bytes = strlen(buffer) + 1;

-       char *buf = xmalloc(1+size);
+       unsigned char *buf = xmalloc(1+size);

 
        memcpy(buf, buffer + bytes, stream->total_out - bytes);
        bytes = stream->total_out - bytes;
 
        memcpy(buf, buffer + bytes, stream->total_out - bytes);
        bytes = stream->total_out - bytes;


@@ -472,7 +472,7 @@ int sha1_file_size(const unsigned char *sha1, unsigned long *sizep)
         * The initial part of the delta starts at delta_data_head +
         * 20.  Borrow code from patch-delta to read the result size.
         */
         * The initial part of the delta starts at delta_data_head +
         * 20.  Borrow code from patch-delta to read the result size.
         */

-       data = hdr + strlen(hdr) + 1 + 20;
+       data = (unsigned char *)(hdr + strlen(hdr) + 1 + 20);

 
        /* Skip over the source size; we are not interested in
         * it and we cannot verify it because we do not want
 
        /* Skip over the source size; we are not interested in
         * it and we cannot verify it because we do not want

diff --git a/ssh-push.c b/ssh-push.c
index 18c0b65d5b18271bc29a0be62f75ee524e51b0e1..12fb9fccbf3e39b4e141ebc0d2d371df395785cf 100644 (file)
--- a/ssh-push.c
+++ b/ssh-push.c
@@ -8,7 +8,7 @@ unsigned char remote_version = 0;
 int serve_object(int fd_in, int fd_out) {
        ssize_t size;
        int posn = 0;
 int serve_object(int fd_in, int fd_out) {
        ssize_t size;
        int posn = 0;

-       char sha1[20];
+       unsigned char sha1[20];

        unsigned long objsize;
        void *buf;
        signed char remote;
        unsigned long objsize;
        void *buf;
        signed char remote;

diff --git a/tar-tree.c b/tar-tree.c
index 4c47fc2bec1e6305d122865e2da318bc795ab8ef..673ac66ed6fd37eeeaa8580b2e43f0e2cee91a16 100644 (file)
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -430,8 +430,8 @@ int main(int argc, char **argv)
        if (!archive_time)
                archive_time = time(NULL);
        if (basedir)
        if (!archive_time)
                archive_time = time(NULL);
        if (basedir)

-               write_header("0", TYPEFLAG_DIR, NULL, NULL, basedir, 040755,
-                            NULL, 0);
+               write_header((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL,
+                       basedir, 040755, NULL, 0);

        traverse_tree(buffer, size, NULL);
        free(buffer);
        write_trailer();
        traverse_tree(buffer, size, NULL);
        free(buffer);
        write_trailer();