X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=convert-cache.c;h=95f0302f7abef98b785bb26edd1b5e2785d609d8;hb=ff3412ee1f74cc267e6d65c03c5fd8ea2214fbe7;hp=8916a3692f89df0d96e8bbdf885f6b9eae6a1212;hpb=89ab859e9452cbc8f1f15afab52257e9b789c899;p=git.git diff --git a/convert-cache.c b/convert-cache.c index 8916a369..95f0302f 100644 --- a/convert-cache.c +++ b/convert-cache.c @@ -60,7 +60,7 @@ static void convert_ascii_sha1(void *buffer) struct entry *entry; if (get_sha1_hex(buffer, sha1)) - die("expected sha1, got '%s'", buffer); + die("expected sha1, got '%s'", (char*) buffer); entry = convert_entry(sha1); memcpy(buffer, sha1_to_hex(entry->new_sha1), 40); } @@ -272,7 +272,7 @@ static void convert_commit(void *buffer, unsigned long size, unsigned char *resu unsigned long orig_size = size; if (memcmp(buffer, "tree ", 5)) - die("Bad commit '%s'", buffer); + die("Bad commit '%s'", (char*) buffer); convert_ascii_sha1(buffer+5); buffer += 46; /* "tree " + "hex sha1" + "\n" */ while (!memcmp(buffer, "parent ", 7)) {