chunk-format.h: extract oid_version()
There are three definitions of an identical function which converts `the_hash_algo` into either 1 (for SHA-1) or 2 (for SHA-256). There is a copy of this function for writing both the commit-graph and multi-pack-index file, and another inline definition used to write the .rev header. Consolidate these into a single definition in chunk-format.h. It's not clear that this is the best header to define this function in, but it should do for now. (Worth noting, the .rev caller expects a 4-byte unsigned, but the other two callers work with a single unsigned byte. The consolidated version uses the latter type, and lets the compiler widen it when required). Another caller will be added in a subsequent patch. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
1c573cdd72
commit
d9fef9d90d
@ -181,3 +181,15 @@ int read_chunk(struct chunkfile *cf,
|
||||
|
||||
return CHUNK_NOT_FOUND;
|
||||
}
|
||||
|
||||
uint8_t oid_version(const struct git_hash_algo *algop)
|
||||
{
|
||||
switch (hash_algo_by_ptr(algop)) {
|
||||
case GIT_HASH_SHA1:
|
||||
return 1;
|
||||
case GIT_HASH_SHA256:
|
||||
return 2;
|
||||
default:
|
||||
die(_("invalid hash version"));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user