Skip to content

Commit

Permalink
bundle.h: make "fd" version of read_bundle_header() public
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
avar authored and derrickstolee committed Apr 21, 2022
1 parent e900977 commit c25327d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions bundle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions bundle.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit c25327d

Please sign in to comment.