summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2010-04-02 00:03:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-02 06:49:03 (GMT)
commitc00e657df23d9e83d86a79657ff9061b1c2d357b (patch)
tree23ca1039d12d63feddaf8cdf84fce692ededb4d5 /cache.h
parent890a13a45285ad44858add2ce2f74eb478f549c8 (diff)
downloadgit-c00e657df23d9e83d86a79657ff9061b1c2d357b.zip
git-c00e657df23d9e83d86a79657ff9061b1c2d357b.tar.gz
git-c00e657df23d9e83d86a79657ff9061b1c2d357b.tar.bz2
fix const-correctness of write_sha1_file
These should take const buffers as input data, but zlib's next_in pointer is not const-correct. Let's fix it at the zlib level, though, so the cast happens in one obvious place. This should be safe, as a similar cast is used in zlib's example code for a const array. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 6dcb100..5eb0573 100644
--- a/cache.h
+++ b/cache.h
@@ -701,7 +701,7 @@ static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *
return read_sha1_file_repl(sha1, type, size, NULL);
}
extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
-extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
+extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
extern int force_object_loose(const unsigned char *sha1, time_t mtime);