X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=mkdelta.c;h=6470a94e527abad37cf49eccac0df1587321630b;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=1c10f1f143ea5fe202a6cf7eb3058e579ecc28c2;hpb=53d4b460858745949287d5bb51f5210b80d86305;p=git.git diff --git a/mkdelta.c b/mkdelta.c index 1c10f1f1..6470a94e 100644 --- a/mkdelta.c +++ b/mkdelta.c @@ -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];