Skip to content

Commit

Permalink
entry: make fstat_output() and read_blob_entry() public
Browse files Browse the repository at this point in the history
These two functions will be used by the parallel checkout code, so let's
make them public. Note: fstat_output() is renamed to
fstat_checkout_output(), now that it has become public, seeking to avoid
future name collisions.

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
matheustavares authored and gitster committed Mar 23, 2021
1 parent d052cc0 commit 49cfd90
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions entry.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static int create_file(const char *path, unsigned int mode)
return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
}

static void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
{
enum object_type type;
void *blob_data = read_object_file(&ce->oid, &type, size);
Expand All @@ -109,7 +109,7 @@ static int open_output_fd(char *path, const struct cache_entry *ce, int to_tempf
}
}

static int fstat_output(int fd, const struct checkout *state, struct stat *st)
int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st)
{
/* use fstat() only when path == ce->name */
if (fstat_is_reliable() &&
Expand All @@ -132,7 +132,7 @@ static int streaming_write_entry(const struct cache_entry *ce, char *path,
return -1;

result |= stream_blob_to_fd(fd, &ce->oid, filter, 1);
*fstat_done = fstat_output(fd, state, statbuf);
*fstat_done = fstat_checkout_output(fd, state, statbuf);
result |= close(fd);

if (result)
Expand Down Expand Up @@ -346,7 +346,7 @@ static int write_entry(struct cache_entry *ce,

wrote = write_in_full(fd, new_blob, size);
if (!to_tempfile)
fstat_done = fstat_output(fd, state, &st);
fstat_done = fstat_checkout_output(fd, state, &st);
close(fd);
free(new_blob);
if (wrote < 0)
Expand Down
3 changes: 3 additions & 0 deletions entry.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@ int finish_delayed_checkout(struct checkout *state, int *nr_checkouts);
*/
void unlink_entry(const struct cache_entry *ce);

void *read_blob_entry(const struct cache_entry *ce, unsigned long *size);
int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st);

#endif /* ENTRY_H */

0 comments on commit 49cfd90

Please sign in to comment.