undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1write: make buffer const-correct

Browse Source 
We are passed a "void *" and write it out without ever
touching it; let's indicate that by using "const".

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2013-10-24 13:59:49 -04:00 committed by Junio C Hamano
parent 3d092bfc6f
commit e74435a516
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
csum-file.c
View File

@ -11,7 +11,7 @@
#include "progress.h" #include "progress.h"
#include "csum-file.h" #include "csum-file.h"
static void flush(struct sha1file *f, void *buf, unsigned int count) static void flush(struct sha1file *f, const void *buf, unsigned int count)
{ {
if (0 <= f->check_fd && count) { if (0 <= f->check_fd && count) {
unsigned char check_buffer[8192]; unsigned char check_buffer[8192];
@ -86,13 +86,13 @@ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
return fd; return fd;
} }
int sha1write(struct sha1file *f, void *buf, unsigned int count) int sha1write(struct sha1file *f, const void *buf, unsigned int count)
{ {
while (count) { while (count) {
unsigned offset = f->offset; unsigned offset = f->offset;
unsigned left = sizeof(f->buffer) - offset; unsigned left = sizeof(f->buffer) - offset;
unsigned nr = count > left ? left : count; unsigned nr = count > left ? left : count;
void *data; const void *data;
if (f->do_crc) if (f->do_crc)
f->crc32 = crc32(f->crc32, buf, nr); f->crc32 = crc32(f->crc32, buf, nr);

2
csum-file.h
View File

@ -34,7 +34,7 @@ extern struct sha1file *sha1fd(int fd, const char *name);
extern struct sha1file *sha1fd_check(const char *name); extern struct sha1file *sha1fd_check(const char *name);
extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp); extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp);
extern int sha1close(struct sha1file *, unsigned char *, unsigned int); extern int sha1close(struct sha1file *, unsigned char *, unsigned int);
extern int sha1write(struct sha1file *, void *, unsigned int); extern int sha1write(struct sha1file *, const void *, unsigned int);
extern void sha1flush(struct sha1file *f); extern void sha1flush(struct sha1file *f);
extern void crc32_begin(struct sha1file *); extern void crc32_begin(struct sha1file *);
extern uint32_t crc32_end(struct sha1file *); extern uint32_t crc32_end(struct sha1file *);