mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
fsck: rename objects-related fsck error functions
The names of objects-related fsck error functions are generic. It's OK when there is only object database check. However, we are going to introduce refs database check report function. To avoid ambiguity, rename object-related fsck error functions to explicitly indicate these functions are used to report objects-related messages. 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
2d79aa9095
commit
8cd4a447b8
26
fsck.h
26
fsck.h
@@ -120,16 +120,16 @@ typedef int (*fsck_error)(struct fsck_options *o,
|
||||
enum fsck_msg_type msg_type, enum fsck_msg_id msg_id,
|
||||
const char *message);
|
||||
|
||||
int fsck_error_function(struct fsck_options *o,
|
||||
const struct object_id *oid, enum object_type object_type,
|
||||
enum fsck_msg_type msg_type, enum fsck_msg_id msg_id,
|
||||
const char *message);
|
||||
int fsck_error_cb_print_missing_gitmodules(struct fsck_options *o,
|
||||
const struct object_id *oid,
|
||||
enum object_type object_type,
|
||||
enum fsck_msg_type msg_type,
|
||||
enum fsck_msg_id msg_id,
|
||||
const char *message);
|
||||
int fsck_objects_error_function(struct fsck_options *o,
|
||||
const struct object_id *oid, enum object_type object_type,
|
||||
enum fsck_msg_type msg_type, enum fsck_msg_id msg_id,
|
||||
const char *message);
|
||||
int fsck_objects_error_cb_print_missing_gitmodules(struct fsck_options *o,
|
||||
const struct object_id *oid,
|
||||
enum object_type object_type,
|
||||
enum fsck_msg_type msg_type,
|
||||
enum fsck_msg_id msg_id,
|
||||
const char *message);
|
||||
|
||||
struct fsck_options {
|
||||
fsck_walk_func walk;
|
||||
@@ -150,7 +150,7 @@ struct fsck_options {
|
||||
.gitmodules_done = OIDSET_INIT, \
|
||||
.gitattributes_found = OIDSET_INIT, \
|
||||
.gitattributes_done = OIDSET_INIT, \
|
||||
.error_func = fsck_error_function \
|
||||
.error_func = fsck_objects_error_function \
|
||||
}
|
||||
#define FSCK_OPTIONS_STRICT { \
|
||||
.strict = 1, \
|
||||
@@ -158,7 +158,7 @@ struct fsck_options {
|
||||
.gitmodules_done = OIDSET_INIT, \
|
||||
.gitattributes_found = OIDSET_INIT, \
|
||||
.gitattributes_done = OIDSET_INIT, \
|
||||
.error_func = fsck_error_function, \
|
||||
.error_func = fsck_objects_error_function, \
|
||||
}
|
||||
#define FSCK_OPTIONS_MISSING_GITMODULES { \
|
||||
.strict = 1, \
|
||||
@@ -166,7 +166,7 @@ struct fsck_options {
|
||||
.gitmodules_done = OIDSET_INIT, \
|
||||
.gitattributes_found = OIDSET_INIT, \
|
||||
.gitattributes_done = OIDSET_INIT, \
|
||||
.error_func = fsck_error_cb_print_missing_gitmodules, \
|
||||
.error_func = fsck_objects_error_cb_print_missing_gitmodules, \
|
||||
}
|
||||
|
||||
/* descend in all linked child objects
|
||||
|
||||
Reference in New Issue
Block a user