Commit f2af9f5e authored by Derrick Stolee's avatar Derrick Stolee Committed by Junio C Hamano

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's avatarDerrick Stolee <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 2ee13a78
...@@ -1269,7 +1269,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha ...@@ -1269,7 +1269,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
nr_objects - nr_objects_initial); nr_objects - nr_objects_initial);
stop_progress_msg(&progress, msg.buf); stop_progress_msg(&progress, msg.buf);
strbuf_release(&msg); strbuf_release(&msg);
hashclose(f, tail_hash, 0); finalize_hashfile(f, tail_hash, 0);
hashcpy(read_hash, pack_hash); hashcpy(read_hash, pack_hash);
fixup_pack_header_footer(output_fd, pack_hash, fixup_pack_header_footer(output_fd, pack_hash,
curr_pack, nr_objects, curr_pack, nr_objects,
......
...@@ -837,11 +837,11 @@ static void write_pack_file(void) ...@@ -837,11 +837,11 @@ static void write_pack_file(void)
* If so, rewrite it like in fast-import * If so, rewrite it like in fast-import
*/ */
if (pack_to_stdout) { if (pack_to_stdout) {
hashclose(f, oid.hash, CSUM_CLOSE); finalize_hashfile(f, oid.hash, CSUM_CLOSE);
} else if (nr_written == nr_remaining) { } else if (nr_written == nr_remaining) {
hashclose(f, oid.hash, CSUM_FSYNC); finalize_hashfile(f, oid.hash, CSUM_FSYNC);
} else { } else {
int fd = hashclose(f, oid.hash, 0); int fd = finalize_hashfile(f, oid.hash, 0);
fixup_pack_header_footer(fd, oid.hash, pack_tmp_name, fixup_pack_header_footer(fd, oid.hash, pack_tmp_name,
nr_written, oid.hash, offset); nr_written, oid.hash, offset);
close(fd); close(fd);
......
...@@ -35,9 +35,9 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state) ...@@ -35,9 +35,9 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state)
unlink(state->pack_tmp_name); unlink(state->pack_tmp_name);
goto clear_exit; goto clear_exit;
} else if (state->nr_written == 1) { } else if (state->nr_written == 1) {
hashclose(state->f, oid.hash, CSUM_FSYNC); finalize_hashfile(state->f, oid.hash, CSUM_FSYNC);
} else { } 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, fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name,
state->nr_written, oid.hash, state->nr_written, oid.hash,
state->offset); state->offset);
......
...@@ -53,7 +53,7 @@ void hashflush(struct hashfile *f) ...@@ -53,7 +53,7 @@ void hashflush(struct hashfile *f)
} }
} }
int hashclose(struct hashfile *f, unsigned char *result, unsigned int flags) int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int flags)
{ {
int fd; int fd;
......
...@@ -26,14 +26,14 @@ struct hashfile_checkpoint { ...@@ -26,14 +26,14 @@ struct hashfile_checkpoint {
extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *); extern void hashfile_checkpoint(struct hashfile *, struct hashfile_checkpoint *);
extern int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *); extern int hashfile_truncate(struct hashfile *, struct hashfile_checkpoint *);
/* hashclose flags */ /* finalize_hashfile flags */
#define CSUM_CLOSE 1 #define CSUM_CLOSE 1
#define CSUM_FSYNC 2 #define CSUM_FSYNC 2
extern struct hashfile *hashfd(int fd, const char *name); extern struct hashfile *hashfd(int fd, const char *name);
extern struct hashfile *hashfd_check(const char *name); extern struct hashfile *hashfd_check(const char *name);
extern struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp); extern struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp);
extern int hashclose(struct hashfile *, unsigned char *, unsigned int); extern int finalize_hashfile(struct hashfile *, unsigned char *, unsigned int);
extern void hashwrite(struct hashfile *, const void *, unsigned int); extern void hashwrite(struct hashfile *, const void *, unsigned int);
extern void hashflush(struct hashfile *f); extern void hashflush(struct hashfile *f);
extern void crc32_begin(struct hashfile *); extern void crc32_begin(struct hashfile *);
......
...@@ -1016,7 +1016,7 @@ static void end_packfile(void) ...@@ -1016,7 +1016,7 @@ static void end_packfile(void)
struct tag *t; struct tag *t;
close_pack_windows(pack_data); close_pack_windows(pack_data);
hashclose(pack_file, cur_pack_oid.hash, 0); finalize_hashfile(pack_file, cur_pack_oid.hash, 0);
fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1, fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
pack_data->pack_name, object_count, pack_data->pack_name, object_count,
cur_pack_oid.hash, pack_size); cur_pack_oid.hash, pack_size);
......
...@@ -535,7 +535,7 @@ void bitmap_writer_finish(struct pack_idx_entry **index, ...@@ -535,7 +535,7 @@ void bitmap_writer_finish(struct pack_idx_entry **index,
if (options & BITMAP_OPT_HASH_CACHE) if (options & BITMAP_OPT_HASH_CACHE)
write_hash_cache(f, index, index_nr); write_hash_cache(f, index, index_nr);
hashclose(f, NULL, CSUM_FSYNC); finalize_hashfile(f, NULL, CSUM_FSYNC);
if (adjust_shared_perm(tmp_file.buf)) if (adjust_shared_perm(tmp_file.buf))
die_errno("unable to make temporary bitmap file readable"); die_errno("unable to make temporary bitmap file readable");
......
...@@ -170,8 +170,8 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec ...@@ -170,8 +170,8 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
} }
hashwrite(f, sha1, the_hash_algo->rawsz); hashwrite(f, sha1, the_hash_algo->rawsz);
hashclose(f, NULL, ((opts->flags & WRITE_IDX_VERIFY) finalize_hashfile(f, NULL, ((opts->flags & WRITE_IDX_VERIFY)
? CSUM_CLOSE : CSUM_FSYNC)); ? CSUM_CLOSE : CSUM_FSYNC));
return index_name; return index_name;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment