Merge branch 'ab/fsck-api-cleanup'

gitster · gitster · commit ed125c4f07ba · 2021-06-02T07:34:27.000+09:00
Last minute compilation fix.

* ab/fsck-api-cleanup:
  builtin/fsck.c: don't conflate "int" and "enum" in callback
diff --git a/builtin/fsck.c b/builtin/fsck.c
@@ -109,7 +109,8 @@ static int fsck_error_func(struct fsck_options *o,
 
 static struct object_array pending;
 
-static int mark_object(struct object *obj, int type, void *data, struct fsck_options *options)
+static int mark_object(struct object *obj, enum object_type type,
+		       void *data, struct fsck_options *options)
 {
 	struct object *parent = data;
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,8 @@ static int fsck_error_func(struct fsck_options *o,`
`109`	`109`
`110`	`110`	`static struct object_array pending;`
`111`	`111`
`112`		`-static int mark_object(struct object obj, int type, void data, struct fsck_options *options)`
	`112`	`+static int mark_object(struct object *obj, enum object_type type,`
	`113`	`+ void data, struct fsck_options options)`
`113`	`114`	`{`
`114`	`115`	`struct object *parent = data;`
`115`	`116`