diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-05-16 20:11:05 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-16 15:02:10 -0700 |
| commit | 89c6e450fe4a919ecb6fa698005a935531c732cf (patch) | |
| tree | ecb661286f28b0cc5c42a756c18a6cba7a858e1a | |
| parent | remote: allow relative_url() to return an absolute url (diff) | |
| download | git-89c6e450fe4a919ecb6fa698005a935531c732cf.tar.gz git-89c6e450fe4a919ecb6fa698005a935531c732cf.zip | |
bundle.h: make "fd" version of read_bundle_header() public
Change the parse_bundle_header() function to be non-static, and rename
it to parse_bundle_header_fd(). The parse_bundle_header() function is
already public, and it's a thin wrapper around this function. This
will be used by code that wants to pass a fd to the bundle API.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | bundle.c | 8 | ||||
| -rw-r--r-- | bundle.h | 2 |
2 files changed, 6 insertions, 4 deletions
@@ -66,8 +66,8 @@ static int parse_bundle_signature(struct bundle_header *header, const char *line return -1; } -static int parse_bundle_header(int fd, struct bundle_header *header, - const char *report_path) +int read_bundle_header_fd(int fd, struct bundle_header *header, + const char *report_path) { struct strbuf buf = STRBUF_INIT; int status = 0; @@ -143,7 +143,7 @@ int read_bundle_header(const char *path, struct bundle_header *header) if (fd < 0) return error(_("could not open '%s'"), path); - return parse_bundle_header(fd, header, path); + return read_bundle_header_fd(fd, header, path); } int is_bundle(const char *path, int quiet) @@ -153,7 +153,7 @@ int is_bundle(const char *path, int quiet) if (fd < 0) return 0; - fd = parse_bundle_header(fd, &header, quiet ? NULL : path); + fd = read_bundle_header_fd(fd, &header, quiet ? NULL : path); if (fd >= 0) close(fd); bundle_header_release(&header); @@ -24,6 +24,8 @@ void bundle_header_release(struct bundle_header *header); int is_bundle(const char *path, int quiet); int read_bundle_header(const char *path, struct bundle_header *header); +int read_bundle_header_fd(int fd, struct bundle_header *header, + const char *report_path); int create_bundle(struct repository *r, const char *path, int argc, const char **argv, struct strvec *pack_options, int version); |