fsck.h: use "enum object_type" instead of "int"

avar · gitster · commit a1aad71601a7 · 2021-03-28T19:03:10.000-07:00
Change the fsck_walk_func to use an "enum object_type" instead of an "int" type. The types are compatible, and ever since this was added in 355885d (add generic, type aware object chain walker, 2008-02-25) we've used entries from object_type (OBJ_BLOB etc.). So this doesn't really change anything as far as the generated code is concerned, it just gives the compiler more information and makes this easier to read. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/fsck.c b/builtin/fsck.c
@@ -192,7 +192,8 @@ static int traverse_reachable(void)
 	return !!result;
 }
 
-static int mark_used(struct object *obj, int type, void *data, struct fsck_options *options)
+static int mark_used(struct object *obj, enum object_type object_type,
+		     void *data, struct fsck_options *options)
 {
 	if (!obj)
 		return 1;
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
@@ -212,7 +212,8 @@ static void cleanup_thread(void)
 	free(thread_data);
 }
 
-static int mark_link(struct object *obj, int type, void *data, struct fsck_options *options)
+static int mark_link(struct object *obj, enum object_type type,
+		     void *data, struct fsck_options *options)
 {
 	if (!obj)
 		return -1;
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
@@ -187,7 +187,8 @@ static void write_cached_object(struct object *obj, struct obj_buffer *obj_buf)
  * that have reachability requirements and calls this function.
  * Verify its reachability and validity recursively and write it out.
  */
-static int check_object(struct object *obj, int type, void *data, struct fsck_options *options)
+static int check_object(struct object *obj, enum object_type type,
+			void *data, struct fsck_options *options)
 {
 	struct obj_buffer *obj_buf;
 
diff --git a/fsck.h b/fsck.h
@@ -23,7 +23,8 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type);
  *     <0	error signaled and abort
  *     >0	error signaled and do not abort
  */
-typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct fsck_options *options);
+typedef int (*fsck_walk_func)(struct object *obj, enum object_type object_type,
+			      void *data, struct fsck_options *options);
 
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
 typedef int (*fsck_error)(struct fsck_options *o,

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,8 @@ static int traverse_reachable(void)`
`192`	`192`	`return !!result;`
`193`	`193`	`}`
`194`	`194`
`195`		`-static int mark_used(struct object obj, int type, void data, struct fsck_options *options)`
	`195`	`+static int mark_used(struct object *obj, enum object_type object_type,`
	`196`	`+ void data, struct fsck_options options)`
`196`	`197`	`{`
`197`	`198`	`if (!obj)`
`198`	`199`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,8 @@ static void cleanup_thread(void)`
`212`	`212`	`free(thread_data);`
`213`	`213`	`}`
`214`	`214`
`215`		`-static int mark_link(struct object obj, int type, void data, struct fsck_options *options)`
	`215`	`+static int mark_link(struct object *obj, enum object_type type,`
	`216`	`+ void data, struct fsck_options options)`
`216`	`217`	`{`
`217`	`218`	`if (!obj)`
`218`	`219`	`return -1;`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,8 @@ static void write_cached_object(struct object obj, struct obj_buffer obj_buf)`
`187`	`187`	`* that have reachability requirements and calls this function.`
`188`	`188`	`* Verify its reachability and validity recursively and write it out.`
`189`	`189`	`*/`
`190`		`-static int check_object(struct object obj, int type, void data, struct fsck_options *options)`
	`190`	`+static int check_object(struct object *obj, enum object_type type,`
	`191`	`+ void data, struct fsck_options options)`
`191`	`192`	`{`
`192`	`193`	`struct obj_buffer *obj_buf;`
`193`	`194`