diff options
| -rw-r--r-- | mkdelta.c | 12 | ||||
| -rw-r--r-- | pull.c | 2 | ||||
| -rw-r--r-- | sha1_file.c | 4 | ||||
| -rw-r--r-- | ssh-push.c | 2 | ||||
| -rw-r--r-- | tar-tree.c | 4 |
5 files changed, 12 insertions, 12 deletions
@@ -36,10 +36,10 @@ static int replace_object(char *buf, unsigned long size, unsigned char *sha1) 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; @@ -54,7 +54,7 @@ static void *create_object(char *buf, unsigned long len, char *hdr, int hdrlen, 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 */; @@ -69,7 +69,7 @@ static void *create_object(char *buf, unsigned long len, char *hdr, int hdrlen, 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]; @@ -84,7 +84,7 @@ static int restore_original_object(char *buf, unsigned long len, 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]; @@ -49,7 +49,7 @@ static int make_sure_we_have_it(const char *what, unsigned char *sha1) 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); diff --git a/sha1_file.c b/sha1_file.c index e648c068b5..6d6073da85 100644 --- 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; - char *buf = xmalloc(1+size); + unsigned char *buf = xmalloc(1+size); 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. */ - 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 diff --git a/ssh-push.c b/ssh-push.c index 18c0b65d5b..12fb9fccbf 100644 --- 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; - char sha1[20]; + unsigned char sha1[20]; unsigned long objsize; void *buf; signed char remote; diff --git a/tar-tree.c b/tar-tree.c index 4c47fc2bec..673ac66ed6 100644 --- 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) - 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(); |