More static
There still are quite a few symbols that ought to be static. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
55
csum-file.c
55
csum-file.c
@ -73,33 +73,6 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct sha1file *sha1create(const char *fmt, ...)
|
||||
{
|
||||
struct sha1file *f;
|
||||
unsigned len;
|
||||
va_list arg;
|
||||
int fd;
|
||||
|
||||
f = xmalloc(sizeof(*f));
|
||||
|
||||
va_start(arg, fmt);
|
||||
len = vsnprintf(f->name, sizeof(f->name), fmt, arg);
|
||||
va_end(arg);
|
||||
if (len >= PATH_MAX)
|
||||
die("you wascally wabbit, you");
|
||||
f->namelen = len;
|
||||
|
||||
fd = open(f->name, O_CREAT | O_EXCL | O_WRONLY, 0666);
|
||||
if (fd < 0)
|
||||
die("unable to open %s (%s)", f->name, strerror(errno));
|
||||
f->fd = fd;
|
||||
f->error = 0;
|
||||
f->offset = 0;
|
||||
f->do_crc = 0;
|
||||
SHA1_Init(&f->ctx);
|
||||
return f;
|
||||
}
|
||||
|
||||
struct sha1file *sha1fd(int fd, const char *name)
|
||||
{
|
||||
struct sha1file *f;
|
||||
@ -121,34 +94,6 @@ struct sha1file *sha1fd(int fd, const char *name)
|
||||
return f;
|
||||
}
|
||||
|
||||
int sha1write_compressed(struct sha1file *f, void *in, unsigned int size, int level)
|
||||
{
|
||||
z_stream stream;
|
||||
unsigned long maxsize;
|
||||
void *out;
|
||||
|
||||
memset(&stream, 0, sizeof(stream));
|
||||
deflateInit(&stream, level);
|
||||
maxsize = deflateBound(&stream, size);
|
||||
out = xmalloc(maxsize);
|
||||
|
||||
/* Compress it */
|
||||
stream.next_in = in;
|
||||
stream.avail_in = size;
|
||||
|
||||
stream.next_out = out;
|
||||
stream.avail_out = maxsize;
|
||||
|
||||
while (deflate(&stream, Z_FINISH) == Z_OK)
|
||||
/* nothing */;
|
||||
deflateEnd(&stream);
|
||||
|
||||
size = stream.total_out;
|
||||
sha1write(f, out, size);
|
||||
free(out);
|
||||
return size;
|
||||
}
|
||||
|
||||
void crc32_begin(struct sha1file *f)
|
||||
{
|
||||
f->crc32 = crc32(0, Z_NULL, 0);
|
||||
|
Reference in New Issue
Block a user