[PATCH 2/3] http-push: use hex_to_bytes()
- From
René Scharfe <l.s.r@web.de>
- Date
- Oct 31, 2017, 13:49 UTC
- Message-ID
- <31ce5c1c-cab3-80aa-623b-43f91ddd2162@web.de>
- In-Reply-To
- <508b1b3f-6b55-eee8-110a-c17d572ec27a@web.de>
The path of a loose object contains its hash value encoded into two substrings of hexadecimal digits, separated by a slash. The current code copies the pieces into a temporary buffer to get rid of the slash and then uses get_oid_hex() to decode the hash value.
Avoid the copy by using hex_to_bytes() directly on the substrings. That's shorter and easier.
While at it correct the length of the second substring in a comment.
Signed-off-by: Rene Scharfe <l.s.r@web.de> --- http-push.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/http-push.c b/http-push.c index 493ee7d719..14435ab65d 100644 --- a/http-push.c +++ b/http-push.c @@ -1007,20 +1007,18 @@ static void remote_ls(const char *path, int flags, void (*userFunc)(struct remote_ls_ctx *ls), void *userData); -/* extract hex from sharded "xx/x{40}" filename */ +/* extract hex from sharded "xx/x{38}" filename */ static int get_oid_hex_from_objpath(const char *path, struct object_id *oid) { - char hex[GIT_MAX_HEXSZ]; - if (strlen(path) != GIT_SHA1_HEXSZ + 1) return -1; - memcpy(hex, path, 2); + if (hex_to_bytes(oid->hash, path, 1)) + return -1; path += 2; path++; /* skip '/' */ - memcpy(hex + 2, path, GIT_SHA1_HEXSZ - 2); - return get_oid_hex(hex, oid); + return hex_to_bytes(oid->hash + 1, path, GIT_SHA1_RAWSZ - 1); } static void process_ls_object(struct remote_ls_ctx *ls)
-- 2.15.0