summary refs log tree commit diff
path: root/bulk-checkin.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2018-04-02 16:34:14 -0400
committerJunio C Hamano <gitster@pobox.com>2018-04-02 14:27:30 -0700
commitf2af9f5e02380ba3868df7daa34368945d500206 (patch)
treed0d2a5d6872fb542477b87254c20e6d0cd7fe5a6 /bulk-checkin.c
parent2ee13a780b1464039b89b9987b1cdd74d9e40780 (diff)
csum-file: rename hashclose() to finalize_hashfile()
The hashclose() method behaves very differently depending on the flags
parameter. In particular, the file descriptor is not always closed.

Perform a simple rename of "hashclose()" to "finalize_hashfile()" in
preparation for functional changes.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bulk-checkin.c')
-rw-r--r--bulk-checkin.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 8bcd1c8665..e8094f5f61 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -35,9 +35,9 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state)
 		unlink(state->pack_tmp_name);
 		goto clear_exit;
 	} else if (state->nr_written == 1) {
-		hashclose(state->f, oid.hash, CSUM_FSYNC);
+		finalize_hashfile(state->f, oid.hash, CSUM_FSYNC);
 	} else {
-		int fd = hashclose(state->f, oid.hash, 0);
+		int fd = finalize_hashfile(state->f, oid.hash, 0);
 		fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name,
 					 state->nr_written, oid.hash,
 					 state->offset);