diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-02 06:04:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-02 06:04:03 (GMT) |
| commit | b8bba419250711a69e09e7648e5c991f4847a127 (patch) | |
| tree | fbf3e2a7c4f36d21ec68d3eed85a13ac6e0d474b /resolve-undo.c | |
| parent | 562d53fa69933b3ade2691b99cbe67722313f43c (diff) | |
| download | git-b8bba419250711a69e09e7648e5c991f4847a127.zip git-b8bba419250711a69e09e7648e5c991f4847a127.tar.gz git-b8bba419250711a69e09e7648e5c991f4847a127.tar.bz2 | |
build: make code "-Wpointer-arith" clean
Recently introduced resolve_undo_read() expected arithmetic to (void *)
to work on byte-addresses. Correct this.
Noticed by Brandon Casey.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
| -rw-r--r-- | resolve-undo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resolve-undo.c b/resolve-undo.c index 37d73cd..0f50ee0 100644 --- a/resolve-undo.c +++ b/resolve-undo.c @@ -53,7 +53,7 @@ void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo) for_each_string_list(write_one, resolve_undo, sb); } -struct string_list *resolve_undo_read(void *data, unsigned long size) +struct string_list *resolve_undo_read(const char *data, unsigned long size) { struct string_list *resolve_undo; size_t len; @@ -93,7 +93,7 @@ struct string_list *resolve_undo_read(void *data, unsigned long size) continue; if (size < 20) goto error; - hashcpy(ui->sha1[i], data); + hashcpy(ui->sha1[i], (const unsigned char *)data); size -= 20; data += 20; } |