mirror of
https://github.com/git/git.git
synced 2024-11-27 20:14:30 +08:00
entry: make fstat_output() and read_blob_entry() public
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>
This commit is contained in:
parent
d052cc0382
commit
49cfd9032a
8
entry.c
8
entry.c
@ -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);
|
||||
@ -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() &&
|
||||
@ -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)
|
||||
@ -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)
|
||||
|
3
entry.h
3
entry.h
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user