diff options
| author |  Jeff King <peff@peff.net> | 2019-01-07 03:37:02 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-01-08 09:40:19 -0800 |
| commit | 00a7760e81e067cdfb6113e02d141d508529ffc7 (patch) | |
| tree | 2ae7c4aa7d1c5964f517ea93c06ad10f7750667a /streaming.c | |
| parent | sha1-file: modernize loose object file functions (diff) | |
| download | tgif-00a7760e81e067cdfb6113e02d141d508529ffc7.tar.xz | |
sha1-file: modernize loose header/stream functions
As with the open/map/close functions for loose objects that were
recently converted, the functions for parsing the loose object stream
use the name "sha1" and a bare "unsigned char *". Let's fix that so that
unpack_sha1_header() becomes unpack_loose_header(), etc.
These conversions are less clear-cut than the file access functions.
You could argue that the they are parsing Git's canonical object format
(i.e., "type size\0contents", over which we compute the hash), which is
not strictly tied to loose storage. But in practice these functions are
used only for loose objects, and using the term "loose_header" (instead
of "object_header") distinguishes it from the object header found in
packfiles (which contains the same information in a different format).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'streaming.c')
| -rw-r--r-- | streaming.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/streaming.c b/streaming.c index 9049146bc1..998e6285d7 100644 --- a/streaming.c +++ b/streaming.c @@ -342,12 +342,12 @@ static open_method_decl(loose) oid, &st->u.loose.mapsize); if (!st->u.loose.mapped) return -1; - if ((unpack_sha1_header(&st->z, - st->u.loose.mapped, - st->u.loose.mapsize, - st->u.loose.hdr, - sizeof(st->u.loose.hdr)) < 0) || - (parse_sha1_header(st->u.loose.hdr, &st->size) < 0)) { + if ((unpack_loose_header(&st->z, + st->u.loose.mapped, + st->u.loose.mapsize, + st->u.loose.hdr, + sizeof(st->u.loose.hdr)) < 0) || + (parse_loose_header(st->u.loose.hdr, &st->size) < 0)) { git_inflate_end(&st->z); munmap(st->u.loose.mapped, st->u.loose.mapsize); return -1; |