mirror of
https://github.com/git/git.git
synced 2026-02-28 18:48:50 +00:00
odb: fix flags parameter to be unsigned
The `flags` parameter accepted by various `for_each_object()` functions is a bitfield of multiple flags. Such parameters are typically unsigned in the Git codebase, but we use `enum odb_for_each_object_flags` in some places. Adapt these function signatures to use the correct type. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
bd1855b897
commit
6358da200f
@@ -414,7 +414,8 @@ static int parse_loose_header(const char *hdr, struct object_info *oi)
|
||||
|
||||
int odb_source_loose_read_object_info(struct odb_source *source,
|
||||
const struct object_id *oid,
|
||||
struct object_info *oi, int flags)
|
||||
struct object_info *oi,
|
||||
unsigned flags)
|
||||
{
|
||||
int ret;
|
||||
int fd;
|
||||
|
||||
@@ -47,7 +47,8 @@ void odb_source_loose_reprepare(struct odb_source *source);
|
||||
|
||||
int odb_source_loose_read_object_info(struct odb_source *source,
|
||||
const struct object_id *oid,
|
||||
struct object_info *oi, int flags);
|
||||
struct object_info *oi,
|
||||
unsigned flags);
|
||||
|
||||
int odb_source_loose_read_object_stream(struct odb_read_stream **out,
|
||||
struct odb_source *source,
|
||||
|
||||
@@ -2259,7 +2259,7 @@ int has_object_kept_pack(struct repository *r, const struct object_id *oid,
|
||||
|
||||
int for_each_object_in_pack(struct packed_git *p,
|
||||
each_packed_object_fn cb, void *data,
|
||||
enum odb_for_each_object_flags flags)
|
||||
unsigned flags)
|
||||
{
|
||||
uint32_t i;
|
||||
int r = 0;
|
||||
@@ -2302,7 +2302,7 @@ int for_each_object_in_pack(struct packed_git *p,
|
||||
}
|
||||
|
||||
int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
|
||||
void *data, enum odb_for_each_object_flags flags)
|
||||
void *data, unsigned flags)
|
||||
{
|
||||
struct odb_source *source;
|
||||
int r = 0;
|
||||
|
||||
@@ -339,9 +339,9 @@ typedef int each_packed_object_fn(const struct object_id *oid,
|
||||
void *data);
|
||||
int for_each_object_in_pack(struct packed_git *p,
|
||||
each_packed_object_fn, void *data,
|
||||
enum odb_for_each_object_flags flags);
|
||||
unsigned flags);
|
||||
int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
|
||||
void *data, enum odb_for_each_object_flags flags);
|
||||
void *data, unsigned flags);
|
||||
|
||||
/* A hook to report invalid files in pack directory */
|
||||
#define PACKDIR_FILE_PACK 1
|
||||
|
||||
Reference in New Issue
Block a user