pack-write: use hashwrite_be32() in write_idx_file()

Commit Message

René Scharfe Sept. 19, 2020, 6:26 p.m. UTC

Call hashwrite_be32() instead of open-coding it.  This shortens the code
a bit and makes it easier to read.

Signed-off-by: René Scharfe <[e-mail]>
---
 pack-write.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

--
2.28.0

Comments

Derrick Stolee Sept. 21, 2020, 6:21 p.m. UTC | #1

On 9/19/2020 2:26 PM, René Scharfe wrote:
> Call hashwrite_be32() instead of open-coding it.  This shortens the code
> a bit and makes it easier to read.

LGTM. Thanks!

-Stolee

Patch

diff --git a/pack-write.c b/pack-write.c
index 685d327d80..a6cdb3c67c 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -117,10 +117,8 @@  const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 	list = sorted_by_sha;
 	for (i = 0; i < nr_objects; i++) {
 		struct pack_idx_entry *obj = *list++;
-		if (index_version < 2) {
-			uint32_t offset = htonl(obj->offset);
-			hashwrite(f, &offset, 4);
-		}
+		if (index_version < 2)
+			hashwrite_be32(f, obj->offset);
 		hashwrite(f, obj->oid.hash, the_hash_algo->rawsz);
 		if ((opts->flags & WRITE_IDX_STRICT) &&
 		    (i && oideq(&list[-2]->oid, &obj->oid)))
@@ -135,8 +133,7 @@  const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 		list = sorted_by_sha;
 		for (i = 0; i < nr_objects; i++) {
 			struct pack_idx_entry *obj = *list++;
-			uint32_t crc32_val = htonl(obj->crc32);
-			hashwrite(f, &crc32_val, 4);
+			hashwrite_be32(f, obj->crc32);
 		}

 		/* write the 32-bit offset table */
@@ -148,8 +145,7 @@  const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 			offset = (need_large_offset(obj->offset, opts)
 				  ? (0x80000000 | nr_large_offset++)
 				  : obj->offset);
-			offset = htonl(offset);
-			hashwrite(f, &offset, 4);
+			hashwrite_be32(f, offset);
 		}

 		/* write the large offset table */