fsck: make "fsck_error" callback generic
The "fsck_error" callback is designed to report the objects-related error messages. It accepts two parameter "oid" and "object_type" which is not generic. In order to provide a unified callback which can report either objects or refs, remove the objects-related parameters and add the generic parameter "void *fsck_report". Create a new "fsck_object_report" structure which incorporates the removed parameters "oid" and "object_type". Then change the corresponding references to adapt to new "fsck_error" callback. Mentored-by: Patrick Steinhardt <ps@pks.im> Mentored-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: shejialuo <shejialuo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
8cd4a447b8
commit
0ec5dfe8c4
@ -2470,11 +2470,10 @@ int repo_has_object_file(struct repository *r,
|
||||
* give more context.
|
||||
*/
|
||||
static int hash_format_check_report(struct fsck_options *opts UNUSED,
|
||||
const struct object_id *oid UNUSED,
|
||||
enum object_type object_type UNUSED,
|
||||
enum fsck_msg_type msg_type UNUSED,
|
||||
enum fsck_msg_id msg_id UNUSED,
|
||||
const char *message)
|
||||
void *fsck_report UNUSED,
|
||||
enum fsck_msg_type msg_type UNUSED,
|
||||
enum fsck_msg_id msg_id UNUSED,
|
||||
const char *message)
|
||||
{
|
||||
error(_("object fails fsck: %s"), message);
|
||||
return 1;
|
||||
|
Reference in New Issue
Block a user