From 4618198a2a356d4b1fcb2b54121e6f35e3a61b78 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 19 Jun 2013 12:05:13 +0300 Subject: [PATCH] db: rename add_db_return_states_callback() => select_return_states_hook() The database hook are confusing. I am renaming things to bring some order to the chaos. Signed-off-by: Dan Carpenter --- check_overflow.c | 2 +- check_user_data.c | 2 +- smatch.h | 2 +- smatch_buf_size.c | 2 +- smatch_clear_buffer.c | 2 +- smatch_extra.c | 8 ++++---- smatch_function_hooks.c | 2 +- smatch_modification_hooks.c | 2 +- smatch_param_cleared.c | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/check_overflow.c b/check_overflow.c index e13b1887..f8fad420 100644 --- a/check_overflow.c +++ b/check_overflow.c @@ -399,7 +399,7 @@ void check_overflow(int id) add_function_hook("sprintf", &match_sprintf, NULL); add_function_hook("memcmp", &match_limited, &b0_l2); add_function_hook("memcmp", &match_limited, &b1_l2); - add_db_return_states_callback(BUF_SIZE, &db_returns_buf_size); + select_return_states_hook(BUF_SIZE, &db_returns_buf_size); add_modification_hook(my_used_id, &delete); if (option_project == PROJ_KERNEL) { add_function_hook("copy_to_user", &match_limited, &b0_l2); diff --git a/check_user_data.c b/check_user_data.c index 35f38d71..fbe572b8 100644 --- a/check_user_data.c +++ b/check_user_data.c @@ -518,7 +518,7 @@ void check_user_data(int id) add_member_info_callback(my_id, struct_member_callback); add_returned_member_callback(my_id, returned_member_callback); add_returned_state_callback(print_returned_user_data); - add_db_return_states_callback(USER_DATA, &db_return_states_userdata); + select_return_states_hook(USER_DATA, &db_return_states_userdata); add_modification_hook(my_id, &set_capped); } diff --git a/smatch.h b/smatch.h index d299a154..d1de9961 100644 --- a/smatch.h +++ b/smatch.h @@ -138,7 +138,7 @@ void add_macro_assign_hook_extra(const char *look_for, func_hook *call_back, void *info); void return_implies_state(const char *look_for, long long start, long long end, implication_hook *call_back, void *info); -void add_db_return_states_callback(int type, return_implies_hook *callback); +void select_return_states_hook(int type, return_implies_hook *callback); void add_db_return_states_before(void (*fn)(void)); void add_db_return_states_after(void (*fn)(void)); int get_implied_return(struct expression *expr, struct range_list **rl); diff --git a/smatch_buf_size.c b/smatch_buf_size.c index dc41de42..8b7e6b09 100644 --- a/smatch_buf_size.c +++ b/smatch_buf_size.c @@ -704,7 +704,7 @@ void register_buf_size(int id) my_size_id = id; add_definition_db_callback(set_param_buf_size, BUF_SIZE); - add_db_return_states_callback(BUF_SIZE, &db_returns_buf_size); + select_return_states_hook(BUF_SIZE, &db_returns_buf_size); add_function_assign_hook("malloc", &match_alloc, INT_PTR(0)); add_function_assign_hook("calloc", &match_calloc, NULL); diff --git a/smatch_clear_buffer.c b/smatch_clear_buffer.c index 109909e9..924d026b 100644 --- a/smatch_clear_buffer.c +++ b/smatch_clear_buffer.c @@ -303,6 +303,6 @@ void register_clear_buffer(int id) add_function_hook("memmove", &match_memcpy, INT_PTR(0)); register_clears_param(); - add_db_return_states_callback(PARAM_CLEARED, &db_param_cleared); + select_return_states_hook(PARAM_CLEARED, &db_param_cleared); } diff --git a/smatch_extra.c b/smatch_extra.c index 80b36bb1..9200fd96 100644 --- a/smatch_extra.c +++ b/smatch_extra.c @@ -1368,11 +1368,11 @@ void register_smatch_extra(int id) add_hook(&match_function_def, FUNC_DEF_HOOK); add_hook(&match_declarations, DECLARATION_HOOK); add_definition_db_callback(set_param_value, PARAM_VALUE); - add_db_return_states_callback(RETURN_VALUE, &db_returned_member_info); + select_return_states_hook(RETURN_VALUE, &db_returned_member_info); add_db_return_states_before(&db_limited_before); - add_db_return_states_callback(LIMITED_VALUE, &db_param_limit); - add_db_return_states_callback(FILTER_VALUE, &db_param_filter); - add_db_return_states_callback(ADDED_VALUE, &db_param_add); + select_return_states_hook(LIMITED_VALUE, &db_param_limit); + select_return_states_hook(FILTER_VALUE, &db_param_filter); + select_return_states_hook(ADDED_VALUE, &db_param_add); add_db_return_states_after(&db_limited_after); } diff --git a/smatch_function_hooks.c b/smatch_function_hooks.c index 585efaa6..c5ddd43e 100644 --- a/smatch_function_hooks.c +++ b/smatch_function_hooks.c @@ -129,7 +129,7 @@ void return_implies_state(const char *look_for, long long start, long long end, add_callback(func_hash, look_for, cb); } -void add_db_return_states_callback(int type, return_implies_hook *callback) +void select_return_states_hook(int type, return_implies_hook *callback) { struct return_implies_callback *cb = __alloc_return_implies_callback(0); diff --git a/smatch_modification_hooks.c b/smatch_modification_hooks.c index 0ada3c78..4400646d 100644 --- a/smatch_modification_hooks.c +++ b/smatch_modification_hooks.c @@ -176,6 +176,6 @@ void register_modification_hooks(int id) void register_modification_hooks_late(int id) { add_hook(&match_call, FUNCTION_CALL_HOOK); - add_db_return_states_callback(ADDED_VALUE, &db_param_add); + select_return_states_hook(ADDED_VALUE, &db_param_add); } diff --git a/smatch_param_cleared.c b/smatch_param_cleared.c index 68ae78ef..d0685729 100644 --- a/smatch_param_cleared.c +++ b/smatch_param_cleared.c @@ -149,7 +149,7 @@ void register_param_cleared(int id) register_clears_param(); - add_db_return_states_callback(PARAM_CLEARED, &db_param_cleared); + select_return_states_hook(PARAM_CLEARED, &db_param_cleared); add_returned_state_callback(&print_return_value_param); if (option_project == PROJ_KERNEL) { -- 2.11.4.GIT