for_each_*_object: take flag arguments as enum

peff · gitster · commit a7ff6f5a0f31 · 2018-08-13T13:48:25.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1904,7 +1904,8 @@ int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn cb, void`
`1904`	`1904`	`return r;`
`1905`	`1905`	`}`
`1906`	`1906`
`1907`		`-int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)`
	`1907`	`+int for_each_packed_object(each_packed_object_fn cb, void *data,`
	`1908`	`+ enum for_each_object_flags flags)`
`1908`	`1909`	`{`
`1909`	`1910`	`struct packed_git *p;`
`1910`	`1911`	`int r = 0;`
Original file line number	Diff line number	Diff line change
`@@ -2146,7 +2146,8 @@ static int loose_from_alt_odb(struct alternate_object_database *alt,`
`2146`	`2146`	`return r;`
`2147`	`2147`	`}`
`2148`	`2148`
`2149`		`-int for_each_loose_object(each_loose_object_fn cb, void *data, unsigned flags)`
	`2149`	`+int for_each_loose_object(each_loose_object_fn cb, void *data,`
	`2150`	`+ enum for_each_object_flags flags)`
`2150`	`2151`	`{`
`2151`	`2152`	`struct loose_alt_odb_data alt;`
`2152`	`2153`	`int r;`