Merge branch 'jk/function-pointer-mismatches-fix' (early part)

gitster · gitster · commit 915e51b74eda · 2023-08-21T09:27:44.000-07:00
Fix a minor regression that some compiler might notice.

* 'jk/function-pointer-mismatches-fix' (early part):
  fsck: use enum object_type for fsck_walk callback
diff --git a/builtin/fsck.c b/builtin/fsck.c
@@ -206,7 +206,7 @@ static int traverse_reachable(void)
 	return !!result;
 }
 
-static int mark_used(struct object *obj, int type UNUSED,
+static int mark_used(struct object *obj, enum object_type type UNUSED,
 		     void *data UNUSED, struct fsck_options *options UNUSED)
 {
 	if (!obj)

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ static int traverse_reachable(void)`
`206`	`206`	`return !!result;`
`207`	`207`	`}`
`208`	`208`
`209`		`-static int mark_used(struct object *obj, int type UNUSED,`
	`209`	`+static int mark_used(struct object *obj, enum object_type type UNUSED,`
`210`	`210`	`void data UNUSED, struct fsck_options options UNUSED)`
`211`	`211`	`{`
`212`	`212`	`if (!obj)`