{"thread":{"id":"1002","subject":"[PATCH] Fix several gcc4 signedness warnings","startedAt":"2005-06-21T20:04:33Z","lastAt":"2005-06-21T20:04:33Z","messageCount":1,"participants":["Mika Kukkonen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"5105","messageId":"20050621200433.GA7302@miku.homelinux.net","threadId":"1002","inReplyTo":null,"subject":"[PATCH] Fix several gcc4 signedness warnings","fromName":"Mika Kukkonen","fromEmail":"mikukkon@miku.homelinux.net","sentAt":"2005-06-21T20:04:33Z","receivedAt":"2005-06-21T20:04:33Z","isPatch":true,"sender":{"key":"mikukkon@miku.homelinux.net","avatar":null},"body":"Here is a patch that fixes several gcc4 warnings about different signedness,\nall between char and unsigned char. I tried to keep the patch minimal\nso resertod to casts in three places.\n\nSigned-off-by: Mika Kukkonen <mikukkon@iki.fi>\n\n mkdelta.c   |   12 ++++++------\n pull.c      |    2 +-\n sha1_file.c |    4 ++--\n ssh-push.c  |    2 +-\n tar-tree.c  |    4 ++--\n 5 files changed, 12 insertions(+), 12 deletions(-)\n\nIndex: git/sha1_file.c\n===================================================================\n--- git.orig/sha1_file.c\n+++ git/sha1_file.c\n@@ -332,7 +332,7 @@ int unpack_sha1_header(z_stream *stream,\n void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size)\n {\n \tint bytes = strlen(buffer) + 1;\n-\tchar *buf = xmalloc(1+size);\n+\tunsigned char *buf = xmalloc(1+size);\n \n \tmemcpy(buf, buffer + bytes, stream->total_out - bytes);\n \tbytes = stream->total_out - bytes;\n@@ -472,7 +472,7 @@ int sha1_file_size(const unsigned char *\n \t * The initial part of the delta starts at delta_data_head +\n \t * 20.  Borrow code from patch-delta to read the result size.\n \t */\n-\tdata = hdr + strlen(hdr) + 1 + 20;\n+\tdata = (unsigned char *)(hdr + strlen(hdr) + 1 + 20);\n \n \t/* Skip over the source size; we are not interested in\n \t * it and we cannot verify it because we do not want\nIndex: git/ssh-push.c\n===================================================================\n--- git.orig/ssh-push.c\n+++ git/ssh-push.c\n@@ -8,7 +8,7 @@ unsigned char remote_version = 0;\n int serve_object(int fd_in, int fd_out) {\n \tssize_t size;\n \tint posn = 0;\n-\tchar sha1[20];\n+\tunsigned char sha1[20];\n \tunsigned long objsize;\n \tvoid *buf;\n \tsigned char remote;\nIndex: git/pull.c\n===================================================================\n--- git.orig/pull.c\n+++ git/pull.c\n@@ -49,7 +49,7 @@ static int make_sure_we_have_it(const ch\n \t\treturn 0;\n \n \tif (get_delta) {\n-\t\tchar delta_sha1[20];\n+\t\tunsigned char delta_sha1[20];\n \t\tstatus = sha1_delta_base(sha1, delta_sha1);\n \t\tif (0 < status)\n \t\t\tstatus = make_sure_we_have_it(what, delta_sha1);\nIndex: git/tar-tree.c\n===================================================================\n--- git.orig/tar-tree.c\n+++ git/tar-tree.c\n@@ -430,8 +430,8 @@ int main(int argc, char **argv)\n \tif (!archive_time)\n \t\tarchive_time = time(NULL);\n \tif (basedir)\n-\t\twrite_header(\"0\", TYPEFLAG_DIR, NULL, NULL, basedir, 040755,\n-\t\t             NULL, 0);\n+\t\twrite_header((unsigned char *)\"0\", TYPEFLAG_DIR, NULL, NULL,\n+\t\t\tbasedir, 040755, NULL, 0);\n \ttraverse_tree(buffer, size, NULL);\n \tfree(buffer);\n \twrite_trailer();\nIndex: git/mkdelta.c\n===================================================================\n--- git.orig/mkdelta.c\n+++ git/mkdelta.c\n@@ -36,10 +36,10 @@ static int replace_object(char *buf, uns\n \treturn 0;\n }\n \n-static void *create_object(char *buf, unsigned long len, char *hdr, int hdrlen,\n-\t\t\t   unsigned long *retsize)\n+static void *create_object(unsigned char *buf, unsigned long len,\n+\t\t\t   char *hdr, int hdrlen, unsigned long *retsize)\n {\n-\tchar *compressed;\n+\tunsigned char *compressed;\n \tunsigned long size;\n \tz_stream stream;\n \n@@ -54,7 +54,7 @@ static void *create_object(char *buf, un\n \tstream.avail_out = size;\n \n \t/* First header.. */\n-\tstream.next_in = hdr;\n+\tstream.next_in = (unsigned char *)hdr;\n \tstream.avail_in = hdrlen;\n \twhile (deflate(&stream, 0) == Z_OK)\n \t\t/* nothing */;\n@@ -69,7 +69,7 @@ static void *create_object(char *buf, un\n \treturn compressed;\n }\n \n-static int restore_original_object(char *buf, unsigned long len,\n+static int restore_original_object(unsigned char *buf, unsigned long len,\n \t\t\t\t   char *type, unsigned char *sha1)\n {\n \tchar hdr[50];\n@@ -84,7 +84,7 @@ static int restore_original_object(char \n \treturn ret;\n }\n \n-static void *create_delta_object(char *buf, unsigned long len,\n+static void *create_delta_object(unsigned char *buf, unsigned long len,\n \t\t\t\t unsigned char *sha1_ref, unsigned long *size)\n {\n \tchar hdr[50];\n\n"}]}