fsck.h: use "enum object_type" instead of "int"
Change the fsck_walk_func to use an "enum object_type" instead of an
"int" type. The types are compatible, and ever since this was added in
355885d531
(add generic, type aware object chain walker, 2008-02-25)
we've used entries from object_type (OBJ_BLOB etc.).
So this doesn't really change anything as far as the generated code is
concerned, it just gives the compiler more information and makes this
easier to read.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d385784f89
commit
a1aad71601
@ -192,7 +192,8 @@ static int traverse_reachable(void)
|
||||
return !!result;
|
||||
}
|
||||
|
||||
static int mark_used(struct object *obj, int type, void *data, struct fsck_options *options)
|
||||
static int mark_used(struct object *obj, enum object_type object_type,
|
||||
void *data, struct fsck_options *options)
|
||||
{
|
||||
if (!obj)
|
||||
return 1;
|
||||
|
@ -212,7 +212,8 @@ static void cleanup_thread(void)
|
||||
free(thread_data);
|
||||
}
|
||||
|
||||
static int mark_link(struct object *obj, int type, void *data, struct fsck_options *options)
|
||||
static int mark_link(struct object *obj, enum object_type type,
|
||||
void *data, struct fsck_options *options)
|
||||
{
|
||||
if (!obj)
|
||||
return -1;
|
||||
|
@ -187,7 +187,8 @@ static void write_cached_object(struct object *obj, struct obj_buffer *obj_buf)
|
||||
* that have reachability requirements and calls this function.
|
||||
* Verify its reachability and validity recursively and write it out.
|
||||
*/
|
||||
static int check_object(struct object *obj, int type, void *data, struct fsck_options *options)
|
||||
static int check_object(struct object *obj, enum object_type type,
|
||||
void *data, struct fsck_options *options)
|
||||
{
|
||||
struct obj_buffer *obj_buf;
|
||||
|
||||
|
3
fsck.h
3
fsck.h
@ -23,7 +23,8 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type);
|
||||
* <0 error signaled and abort
|
||||
* >0 error signaled and do not abort
|
||||
*/
|
||||
typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct fsck_options *options);
|
||||
typedef int (*fsck_walk_func)(struct object *obj, enum object_type object_type,
|
||||
void *data, struct fsck_options *options);
|
||||
|
||||
/* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
|
||||
typedef int (*fsck_error)(struct fsck_options *o,
|
||||
|
Loading…
Reference in New Issue
Block a user