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

Commit Message

René Scharfe Aug. 2, 2020, 2:36 p.m. UTC

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.

Reviewed-by: brian m. carlson <[e-mail]>
Signed-off-by: René Scharfe <[e-mail]>
---
Original submission (forgot to copy Junio):
https://public-inbox.org/git/[e-mail]/

 bisect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.27.0

Comments

Junio C Hamano Aug. 2, 2020, 8:03 p.m. UTC | #1

René Scharfe <[e-mail]> writes:

> 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.
>
> Reviewed-by: brian m. carlson <[e-mail]>
> Signed-off-by: René Scharfe <[e-mail]>
> ---

Thanks.

Patch

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;