entry: make fstat_output() and read_blob_entry() public

matheustavares · gitster · commit 49cfd9032a5c · 2021-03-23T10:34:05.000-07:00
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 &lt;matheus.bernardino@usp.br&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/entry.c b/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)
diff --git a/entry.h b/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 */

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ static int create_file(const char *path, unsigned int mode)`
`84`	`84`	`return open(path, O_WRONLY \| O_CREAT \| O_EXCL, mode);`
`85`	`85`	`}`
`86`	`86`
`87`		`-static void read_blob_entry(const struct cache_entry ce, unsigned long *size)`
	`87`	`+void read_blob_entry(const struct cache_entry ce, unsigned long *size)`
`88`	`88`	`{`
`89`	`89`	`enum object_type type;`
`90`	`90`	`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`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`112`		`-static int fstat_output(int fd, const struct checkout state, struct stat st)`
	`112`	`+int fstat_checkout_output(int fd, const struct checkout state, struct stat st)`
`113`	`113`	`{`
`114`	`114`	`/* use fstat() only when path == ce->name */`
`115`	`115`	`if (fstat_is_reliable() &&`
`@@ -132,7 +132,7 @@ static int streaming_write_entry(const struct cache_entry ce, char path,`
`132`	`132`	`return -1;`
`133`	`133`
`134`	`134`	`result \|= stream_blob_to_fd(fd, &ce->oid, filter, 1);`
`135`		`- *fstat_done = fstat_output(fd, state, statbuf);`
	`135`	`+ *fstat_done = fstat_checkout_output(fd, state, statbuf);`
`136`	`136`	`result \|= close(fd);`
`137`	`137`
`138`	`138`	`if (result)`
`@@ -346,7 +346,7 @@ static int write_entry(struct cache_entry *ce,`
`346`	`346`
`347`	`347`	`wrote = write_in_full(fd, new_blob, size);`
`348`	`348`	`if (!to_tempfile)`
`349`		`- fstat_done = fstat_output(fd, state, &st);`
	`349`	`+ fstat_done = fstat_checkout_output(fd, state, &st);`
`350`	`350`	`close(fd);`
`351`	`351`	`free(new_blob);`
`352`	`352`	`if (wrote < 0)`