summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-08-10 23:09:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-13 20:48:25 (GMT)
commita7ff6f5a0f310406aa4973e8d7ec25815554bcb5 (patch)
tree6b2a61709b419a609a6be78e84584ad26991e55e
parent202e7f1e161b5bce6587d1a696843ead10a8b477 (diff)
downloadgit-a7ff6f5a0f310406aa4973e8d7ec25815554bcb5.zip
git-a7ff6f5a0f310406aa4973e8d7ec25815554bcb5.tar.gz
git-a7ff6f5a0f310406aa4973e8d7ec25815554bcb5.tar.bz2
for_each_*_object: take flag arguments as enum
It's not wrong to pass our flags in an "unsigned", as we know it will be at least as large as the enum. However, using the enum in the declaration makes it more obvious where to find the list of flags. While we're here, let's also drop the "extern" noise-words from the declarations, per our modern coding style. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h3
-rw-r--r--packfile.c3
-rw-r--r--packfile.h5
-rw-r--r--sha1-file.c3
4 files changed, 9 insertions, 5 deletions
diff --git a/cache.h b/cache.h
index 4187238..9e02fc4 100644
--- a/cache.h
+++ b/cache.h
@@ -1640,7 +1640,8 @@ enum for_each_object_flags {
* repository and any alternates repositories (unless the
* LOCAL_ONLY flag is set).
*/
-extern int for_each_loose_object(each_loose_object_fn, void *, unsigned flags);
+int for_each_loose_object(each_loose_object_fn, void *,
+ enum for_each_object_flags flags);
/*
* Set this to 0 to prevent sha1_object_info_extended() from fetching missing
diff --git a/packfile.c b/packfile.c
index 6974903..9da8f6d 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1904,7 +1904,8 @@ int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn cb, void
return r;
}
-int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
+int for_each_packed_object(each_packed_object_fn cb, void *data,
+ enum for_each_object_flags flags)
{
struct packed_git *p;
int r = 0;
diff --git a/packfile.h b/packfile.h
index 6ddc6a2..9861728 100644
--- a/packfile.h
+++ b/packfile.h
@@ -158,8 +158,9 @@ typedef int each_packed_object_fn(const struct object_id *oid,
struct packed_git *pack,
uint32_t pos,
void *data);
-extern int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn, void *data);
-extern int for_each_packed_object(each_packed_object_fn, void *, unsigned flags);
+int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn, void *data);
+int for_each_packed_object(each_packed_object_fn, void *,
+ enum for_each_object_flags flags);
/*
* Return 1 if an object in a promisor packfile is or refers to the given
diff --git a/sha1-file.c b/sha1-file.c
index dfa8a35..cc0b57a 100644
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -2146,7 +2146,8 @@ static int loose_from_alt_odb(struct alternate_object_database *alt,
return r;
}
-int for_each_loose_object(each_loose_object_fn cb, void *data, unsigned flags)
+int for_each_loose_object(each_loose_object_fn cb, void *data,
+ enum for_each_object_flags flags)
{
struct loose_alt_odb_data alt;
int r;