From: Ævar Arnfjörð Bjarmason Date: Tue, 1 Jun 2021 00:05:59 +0000 (+0200) Subject: builtin/fsck.c: don't conflate "int" and "enum" in callback X-Git-Tag: v2.32.0-rc3~2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28abf260a52b2fb79342d5010e921602e078149f;p=thirdparty%2Fgit.git builtin/fsck.c: don't conflate "int" and "enum" in callback Fix a warning on AIX's xlc compiler that's been emitted since my a1aad71601a (fsck.h: use "enum object_type" instead of "int", 2021-03-28): "builtin/fsck.c", line 805.32: 1506-068 (W) Operation between types "int(*)(struct object*,enum object_type,void*,struct fsck_options*)" and "int(*)(struct object*,int,void*,struct fsck_options*)" is not allowed. I.e. it complains about us assigning a function with a prototype "int" where we're expecting "enum object_type". Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/builtin/fsck.c b/builtin/fsck.c index 70ff95837a..d606c4444d 100644 --- 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;