[PATCH] bisect: use oid_to_hex_r() instead of memcpy()+oid_to_hex()

[PATCH] bisect: use oid_to_hex_r() instead of memcpy()+oid_to_hex()

[René Scharfe]

Write the hexadecimal object ID directly into the destination buffer
using oid_to_hex_r() instead of writing it into a static buffer first
using oid_to_hex() and then copying it from there using memcpy().
This is shorter, simpler and a bit more efficient.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 bisect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bisect.c b/bisect.c
index d5e830410f..be3ff1e962 100644
--- a/bisect.c
+++ b/bisect.c
@@ -709,7 +709,7 @@ static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int
 	char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
 	enum bisect_error res = BISECT_OK;

-	memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), the_hash_algo->hexsz + 1);
+	oid_to_hex_r(bisect_rev_hex, bisect_rev);
 	update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);

 	argv_checkout[2] = bisect_rev_hex;
--
2.27.0

Re: [PATCH] bisect: use oid_to_hex_r() instead of memcpy()+oid_to_hex()

[brian m. carlson]

[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]

On 2020-07-26 at 17:41:12, René Scharfe wrote:
> Write the hexadecimal object ID directly into the destination buffer
> using oid_to_hex_r() instead of writing it into a static buffer first
> using oid_to_hex() and then copying it from there using memcpy().
> This is shorter, simpler and a bit more efficient.
> 
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
>  bisect.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/bisect.c b/bisect.c
> index d5e830410f..be3ff1e962 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -709,7 +709,7 @@ static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int
>  	char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
>  	enum bisect_error res = BISECT_OK;
> 
> -	memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), the_hash_algo->hexsz + 1);
> +	oid_to_hex_r(bisect_rev_hex, bisect_rev);
>  	update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
> 
>  	argv_checkout[2] = bisect_rev_hex;

Yeah, this seems better in pretty much every way, and as a nice perk we
lose an explicit dependency on the_hash_algo.
-- 
brian m. carlson: Houston, Texas, US

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]