{"thread":{"id":"648","subject":"[PATCH] Kill a bunch of pointer sign warnings for gcc4","startedAt":"2005-05-18T12:14:09Z","lastAt":"2005-05-18T12:14:09Z","messageCount":1,"participants":["Brian Gerst"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"3493","messageId":"428B3191.2090206@didntduck.org","threadId":"648","inReplyTo":null,"subject":"[PATCH] Kill a bunch of pointer sign warnings for gcc4","fromName":"Brian Gerst","fromEmail":"bgerst@didntduck.org","sentAt":"2005-05-18T12:14:09Z","receivedAt":"2005-05-18T12:14:09Z","isPatch":true,"sender":{"key":"bgerst@didntduck.org","avatar":null},"body":"- Raw hashes should be unsigned char.\n- String functions want signed char.\n- Hash and compress functions want unsigned char.\n\nSigned-off By: Brian Gerst <bgerst@didntduck.org>\n----------------------------\n\nPS.\ntar-tree.c: In function ‘main’:\ntar-tree.c:437: warning: pointer targets in passing argument 1 of \n‘write_header’ differ in signedness\n\nThe \"0\" looks bogus, since it should be a raw hash not a text string.\n\n\n\nKill a bunch of pointer sign warnings for gcc4.\n\n---\ncommit 9d6d4056081ea693b9d0b28a1507921328df0b26\ntree 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3\nparent 02481aec2a2cfce7bc47d0d10876be5507f0b7ba\nauthor <bgerst@citadel.(none)> Wed, 18 May 2005 07:59:28 -0400\ncommitter <bgerst@citadel.(none)> Wed, 18 May 2005 07:59:28 -0400\n\n cache.h      |    4 ++--\n diff-cache.c |    2 +-\n diff-files.c |    4 ++--\n http-pull.c  |    4 ++--\n ls-tree.c    |    2 +-\n read-cache.c |    2 +-\n rpush.c      |    2 +-\n sha1_file.c  |   18 +++++++++---------\n strbuf.h     |    2 +-\n tar-tree.c   |    6 +++---\n 10 files changed, 23 insertions(+), 23 deletions(-)\n\nIndex: cache.h\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/cache.h  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/cache.h  (mode:100644)\n@@ -143,7 +143,7 @@\n extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size);\n extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size);\n extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);\n-extern int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *return_sha1);\n+extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);\n \n extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size, const char *type);\n \n@@ -167,7 +167,7 @@\n extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);\n \n extern void *read_object_with_reference(const unsigned char *sha1,\n-\t\t\t\t\tconst unsigned char *required_type,\n+\t\t\t\t\tconst char *required_type,\n \t\t\t\t\tunsigned long *size,\n \t\t\t\t\tunsigned char *sha1_ret);\n \nIndex: diff-cache.c\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/diff-cache.c  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/diff-cache.c  (mode:100644)\n@@ -63,7 +63,7 @@\n {\n \tunsigned int mode, oldmode;\n \tunsigned char *sha1;\n-\tunsigned char old_sha1_hex[60];\n+\tchar old_sha1_hex[60];\n \n \tif (get_stat_data(new, &sha1, &mode) < 0) {\n \t\tif (report_missing)\nIndex: diff-files.c\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/diff-files.c  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/diff-files.c  (mode:100644)\n@@ -48,7 +48,7 @@\n }\n \n static void show_modified(int oldmode, int mode,\n-\t\t\t  const char *old_sha1, const char *sha1,\n+\t\t\t  const unsigned char *old_sha1, const unsigned char *sha1,\n \t\t\t  char *path)\n {\n \tchar old_sha1_hex[41];\n@@ -64,7 +64,7 @@\n \n int main(int argc, char **argv)\n {\n-\tstatic const char null_sha1[20] = { 0, };\n+\tstatic const unsigned char null_sha1[20] = { 0, };\n \tint entries = read_cache();\n \tint i;\n \nIndex: http-pull.c\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/http-pull.c  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/http-pull.c  (mode:100644)\n@@ -24,7 +24,7 @@\n \n static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb, \n \t\t\t       void *data) {\n-\tchar expn[4096];\n+\tunsigned char expn[4096];\n \tsize_t size = eltsize * nmemb;\n \tint posn = 0;\n \tdo {\n@@ -49,7 +49,7 @@\n {\n \tchar *hex = sha1_to_hex(sha1);\n \tchar *filename = sha1_file_name(sha1);\n-\tchar real_sha1[20];\n+\tunsigned char real_sha1[20];\n \tchar *url;\n \tchar *posn;\n \nIndex: ls-tree.c\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/ls-tree.c  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/ls-tree.c  (mode:100644)\n@@ -24,7 +24,7 @@\n }\n \n static void list_recursive(void *buffer,\n-\t\t\t   const unsigned char *type,\n+\t\t\t   const char *type,\n \t\t\t   unsigned long size,\n \t\t\t   struct path_prefix *prefix)\n {\nIndex: read-cache.c\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/read-cache.c  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/read-cache.c  (mode:100644)\n@@ -344,7 +344,7 @@\n }\n \n #define WRITE_BUFFER_SIZE 8192\n-static char write_buffer[WRITE_BUFFER_SIZE];\n+static unsigned char write_buffer[WRITE_BUFFER_SIZE];\n static unsigned long write_buffer_len;\n \n static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)\nIndex: rpush.c\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/rpush.c  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/rpush.c  (mode:100644)\n@@ -6,7 +6,7 @@\n void service(int fd_in, int fd_out) {\n \tssize_t size;\n \tint posn;\n-\tchar sha1[20];\n+\tchar unsigned sha1[20];\n \tunsigned long objsize;\n \tvoid *buf;\n \tdo {\nIndex: sha1_file.c\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/sha1_file.c  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/sha1_file.c  (mode:100644)\n@@ -313,13 +313,13 @@\n \tint ret, bytes;\n \tz_stream stream;\n \tchar buffer[8192];\n-\tchar *buf;\n+\tunsigned char *buf;\n \n \t/* Get the data stream */\n \tmemset(&stream, 0, sizeof(stream));\n \tstream.next_in = map;\n \tstream.avail_in = mapsize;\n-\tstream.next_out = buffer;\n+\tstream.next_out = (unsigned char *)buffer;\n \tstream.avail_out = sizeof(buffer);\n \n \tinflateInit(&stream);\n@@ -359,7 +359,7 @@\n }\n \n void *read_object_with_reference(const unsigned char *sha1,\n-\t\t\t\t const unsigned char *required_type,\n+\t\t\t\t const char *required_type,\n \t\t\t\t unsigned long *size,\n \t\t\t\t unsigned char *actual_sha1_return)\n {\n@@ -403,20 +403,20 @@\n \t}\n }\n \n-int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *returnsha1)\n+int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *returnsha1)\n {\n \tint size;\n-\tchar *compressed;\n+\tunsigned char *compressed;\n \tz_stream stream;\n \tunsigned char sha1[20];\n \tSHA_CTX c;\n \tchar *filename;\n \tstatic char tmpfile[PATH_MAX];\n-\tchar hdr[50];\n+\tunsigned char hdr[50];\n \tint fd, hdrlen, ret;\n \n \t/* Generate the header */\n-\thdrlen = sprintf(hdr, \"%s %lu\", type, len)+1;\n+\thdrlen = sprintf((char *)hdr, \"%s %lu\", type, len)+1;\n \n \t/* Sha1.. */\n \tSHA1_Init(&c);\n@@ -516,8 +516,8 @@\n \tint local;\n \tz_stream stream;\n \tunsigned char real_sha1[20];\n-\tchar buf[4096];\n-\tchar discard[4096];\n+\tunsigned char buf[4096];\n+\tunsigned char discard[4096];\n \tint ret;\n \tSHA_CTX c;\n \nIndex: strbuf.h\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/strbuf.h  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/strbuf.h  (mode:100644)\n@@ -4,7 +4,7 @@\n \tint alloc;\n \tint len;\n \tint eof;\n-\tunsigned char *buf;\n+\tchar *buf;\n };\n \n extern void strbuf_init(struct strbuf *);\nIndex: tar-tree.c\n===================================================================\n--- 2b3e8f627f4b8338e1479f6011052d2f6c0e2468/tar-tree.c  (mode:100644)\n+++ 6da6a42bd7b97ea6ebd79544f4fb16713ac74dc3/tar-tree.c  (mode:100644)\n@@ -205,7 +205,7 @@\n \tappend_char(p, '\\n');\n }\n \n-static void write_header(const char *, char, const char *, struct path_prefix *,\n+static void write_header(const unsigned char *, char, const char *, struct path_prefix *,\n                          const char *, unsigned int, void *, unsigned long);\n \n /* stores a pax extended header directly in the block buffer */\n@@ -238,7 +238,7 @@\n \tfree(buffer);\n }\n \n-static void write_global_extended_header(const char *sha1)\n+static void write_global_extended_header(const unsigned char *sha1)\n {\n \tchar *p;\n \tunsigned int size;\n@@ -253,7 +253,7 @@\n }\n \n /* stores a ustar header directly in the block buffer */\n-static void write_header(const char *sha1, char typeflag, const char *basepath,\n+static void write_header(const unsigned char *sha1, char typeflag, const char *basepath,\n                          struct path_prefix *prefix, const char *path,\n                          unsigned int mode, void *buffer, unsigned long size)\n {\n\n"}]}