From 5afc4b1dc622d574bcd67b5845789a0b5875431a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 18 Oct 2019 00:58:40 -0400 Subject: fsck: only provide oid/type in fsck_error callback None of the callbacks actually care about having a "struct object"; they're happy with just the oid and type information. So let's give ourselves more flexibility to avoid having a "struct object" by just passing the broken-down fields. Note that the callback already takes a "type" field for the fsck message type. We'll rename that to "msg_type" (and use "object_type" for the object type) to make the distinction explicit. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- fsck.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'fsck.h') diff --git a/fsck.h b/fsck.h index 36cfa463af..69cf715e79 100644 --- a/fsck.h +++ b/fsck.h @@ -27,10 +27,12 @@ typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct f /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */ typedef int (*fsck_error)(struct fsck_options *o, - struct object *obj, int type, const char *message); + const struct object_id *oid, enum object_type object_type, + int msg_type, const char *message); int fsck_error_function(struct fsck_options *o, - struct object *obj, int type, const char *message); + const struct object_id *oid, enum object_type object_type, + int msg_type, const char *message); struct fsck_options { fsck_walk_func walk; -- cgit v1.2.3