From 83b1375bb71f7ddb56010cca0527c52d19eb1a4b Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 25 Feb 2014 17:03:03 +0300 Subject: [PATCH] avl: rename struct AVL to struct stree Signed-off-by: Dan Carpenter --- avl.c | 40 ++++++++++++------------ avl.h | 30 +++++++++--------- check_balanced.c | 2 +- check_debug.c | 8 ++--- check_dereferences_param.c | 2 +- check_double_checking.c | 2 +- check_frees_argument.c | 2 +- check_frees_param.c | 2 +- check_held_dev.c | 2 +- check_leaks.c | 2 +- check_locking.c | 4 +-- check_memory.c | 2 +- check_puts_argument.c | 2 +- check_return_enomem.c | 2 +- check_template.c | 2 +- check_unwind.c | 2 +- check_user_data.c | 8 ++--- smatch.h | 28 ++++++++--------- smatch_comparison.c | 6 ++-- smatch_conditions.c | 22 +++++++------- smatch_db.c | 12 ++++---- smatch_extra.c | 8 ++--- smatch_extra.h | 2 +- smatch_flow.c | 2 +- smatch_function_hooks.c | 24 +++++++-------- smatch_implied.c | 50 +++++++++++++++--------------- smatch_local_values.c | 2 +- smatch_modification_hooks.c | 2 +- smatch_param_cleared.c | 2 +- smatch_param_filter.c | 4 +-- smatch_param_limit.c | 4 +-- smatch_param_set.c | 2 +- smatch_returns.c | 6 ++-- smatch_slist.c | 74 ++++++++++++++++++++++----------------------- smatch_slist.h | 38 +++++++++++------------ smatch_start_states.c | 4 +-- smatch_states.c | 74 ++++++++++++++++++++++----------------------- smatch_type_val.c | 6 ++-- 38 files changed, 243 insertions(+), 243 deletions(-) diff --git a/avl.c b/avl.c index 1866ca27..cab3df4f 100644 --- a/avl.c +++ b/avl.c @@ -29,17 +29,17 @@ static AvlNode *mkNode(const struct sm_state *sm); static void freeNode(AvlNode *node); -static AvlNode *lookup(const AVL *avl, AvlNode *node, const struct sm_state *sm); +static AvlNode *lookup(const stree *avl, AvlNode *node, const struct sm_state *sm); -static bool insert_sm(AVL *avl, AvlNode **p, const struct sm_state *sm); -static bool remove_sm(AVL *avl, AvlNode **p, const struct sm_state *sm, AvlNode **ret); +static bool insert_sm(stree *avl, AvlNode **p, const struct sm_state *sm); +static bool remove_sm(stree *avl, AvlNode **p, const struct sm_state *sm, AvlNode **ret); static bool removeExtremum(AvlNode **p, int side, AvlNode **ret); static int sway(AvlNode **p, int sway); static void balance(AvlNode **p, int side); static bool checkBalances(AvlNode *node, int *height); -static bool checkOrder(AVL *avl); +static bool checkOrder(stree *avl); static size_t countNode(AvlNode *node); /* @@ -63,9 +63,9 @@ static int sign(int cmp) return 1; } -AVL *avl_new(void) +stree *avl_new(void) { - AVL *avl = malloc(sizeof(*avl)); + stree *avl = malloc(sizeof(*avl)); assert(avl != NULL); @@ -74,7 +74,7 @@ AVL *avl_new(void) return avl; } -void avl_free(AVL **avl) +void avl_free(stree **avl) { if (*avl) { freeNode((*avl)->root); @@ -83,7 +83,7 @@ void avl_free(AVL **avl) *avl = NULL; } -struct sm_state *avl_lookup(const AVL *avl, const struct sm_state *sm) +struct sm_state *avl_lookup(const stree *avl, const struct sm_state *sm) { AvlNode *found; @@ -95,19 +95,19 @@ struct sm_state *avl_lookup(const AVL *avl, const struct sm_state *sm) return (struct sm_state *)found->sm; } -AvlNode *avl_lookup_node(const AVL *avl, const struct sm_state *sm) +AvlNode *avl_lookup_node(const stree *avl, const struct sm_state *sm) { return lookup(avl, avl->root, sm); } -size_t avl_count(const AVL *avl) +size_t avl_count(const stree *avl) { if (!avl) return 0; return avl->count; } -bool avl_insert(AVL **avl, const struct sm_state *sm) +bool avl_insert(stree **avl, const struct sm_state *sm) { size_t old_count; @@ -118,7 +118,7 @@ bool avl_insert(AVL **avl, const struct sm_state *sm) return (*avl)->count != old_count; } -bool avl_remove(AVL **avl, const struct sm_state *sm) +bool avl_remove(stree **avl, const struct sm_state *sm) { AvlNode *node = NULL; @@ -160,7 +160,7 @@ static void freeNode(AvlNode *node) } } -static AvlNode *lookup(const AVL *avl, AvlNode *node, const struct sm_state *sm) +static AvlNode *lookup(const stree *avl, AvlNode *node, const struct sm_state *sm) { int cmp; @@ -181,7 +181,7 @@ static AvlNode *lookup(const AVL *avl, AvlNode *node, const struct sm_state *sm) * * Return true if the subtree's height increased. */ -static bool insert_sm(AVL *avl, AvlNode **p, const struct sm_state *sm) +static bool insert_sm(stree *avl, AvlNode **p, const struct sm_state *sm) { if (*p == NULL) { *p = mkNode(sm); @@ -211,7 +211,7 @@ static bool insert_sm(AVL *avl, AvlNode **p, const struct sm_state *sm) * * Return true if the subtree's height decreased. */ -static bool remove_sm(AVL *avl, AvlNode **p, const struct sm_state *sm, AvlNode **ret) +static bool remove_sm(stree *avl, AvlNode **p, const struct sm_state *sm, AvlNode **ret) { if (p == NULL || *p == NULL) { return false; @@ -357,7 +357,7 @@ static void balance(AvlNode **p, int side) /************************* avl_check_invariants() *************************/ -bool avl_check_invariants(AVL *avl) +bool avl_check_invariants(stree *avl) { int dummy; @@ -387,7 +387,7 @@ static bool checkBalances(AvlNode *node, int *height) } } -static bool checkOrder(AVL *avl) +static bool checkOrder(stree *avl) { AvlIter i; const struct sm_state *last = NULL; @@ -414,7 +414,7 @@ static size_t countNode(AvlNode *node) /************************* Traversal *************************/ -void avl_iter_begin(AvlIter *iter, AVL *avl, AvlDirection dir) +void avl_iter_begin(AvlIter *iter, stree *avl, AvlDirection dir) { AvlNode *node; @@ -463,9 +463,9 @@ void avl_iter_next(AvlIter *iter) iter->sm = (struct sm_state *) node->sm; } -AVL *clone_stree(AVL *orig) +stree *clone_stree(stree *orig) { - AVL *new = NULL; + stree *new = NULL; AvlIter i; avl_foreach(i, orig) diff --git a/avl.h b/avl.h index c49ed686..086c3219 100644 --- a/avl.h +++ b/avl.h @@ -28,37 +28,37 @@ struct sm_state; -typedef struct AVL AVL; +typedef struct stree stree; typedef struct AvlNode AvlNode; typedef struct AvlIter AvlIter; -void avl_free(AVL **avl); - /* Free an AVL tree. */ +void avl_free(stree **avl); + /* Free an stree tree. */ -struct sm_state *avl_lookup(const AVL *avl, const struct sm_state *sm); +struct sm_state *avl_lookup(const stree *avl, const struct sm_state *sm); /* O(log n). Lookup a sm. Return NULL if the sm is not present. */ #define avl_member(avl, sm) (!!avl_lookup_node(avl, sm)) /* O(log n). See if a sm is present. */ -size_t avl_count(const AVL *avl); +size_t avl_count(const stree *avl); /* O(1). Return the number of elements in the tree. */ -bool avl_insert(AVL **avl, const struct sm_state *sm); +bool avl_insert(stree **avl, const struct sm_state *sm); /* * O(log n). Insert an sm or replace it if already present. * * Return false if the insertion replaced an existing sm. */ -bool avl_remove(AVL **avl, const struct sm_state *sm); +bool avl_remove(stree **avl, const struct sm_state *sm); /* * O(log n). Remove an sm (if present). * * Return true if it was removed. */ -bool avl_check_invariants(AVL *avl); +bool avl_check_invariants(stree *avl); /* For testing purposes. This function will always return true :-) */ @@ -66,7 +66,7 @@ bool avl_check_invariants(AVL *avl); #define avl_foreach(iter, avl) avl_traverse(iter, avl, FORWARD) /* - * O(n). Traverse an AVL tree in order. + * O(n). Traverse an stree tree in order. * * Example: * @@ -84,7 +84,7 @@ bool avl_check_invariants(AVL *avl); #define END_FOR_EACH_SM(_sm) }} #define avl_foreach_reverse(iter, avl) avl_traverse(iter, avl, BACKWARD) - /* O(n). Traverse an AVL tree in reverse order. */ + /* O(n). Traverse an stree tree in reverse order. */ typedef enum AvlDirection {FORWARD = 0, BACKWARD = 1} AvlDirection; @@ -98,7 +98,7 @@ struct AvlIter { AvlDirection direction; }; -void avl_iter_begin(AvlIter *iter, AVL *avl, AvlDirection dir); +void avl_iter_begin(AvlIter *iter, stree *avl, AvlDirection dir); void avl_iter_next(AvlIter *iter); #define avl_traverse(iter, avl, direction) \ for (avl_iter_begin(&(iter), avl, direction); \ @@ -108,7 +108,7 @@ void avl_iter_next(AvlIter *iter); /***************** Internal data structures ******************/ -struct AVL { +struct stree { AvlNode *root; size_t count; }; @@ -120,9 +120,9 @@ struct AvlNode { int balance; /* -1, 0, or 1 */ }; -AvlNode *avl_lookup_node(const AVL *avl, const struct sm_state *sm); - /* O(log n). Lookup an AVL node by sm. Return NULL if not present. */ +AvlNode *avl_lookup_node(const stree *avl, const struct sm_state *sm); + /* O(log n). Lookup an stree node by sm. Return NULL if not present. */ -AVL *clone_stree(AVL *orig); +stree *clone_stree(stree *orig); #endif diff --git a/check_balanced.c b/check_balanced.c index 1d34e736..afcb29fa 100644 --- a/check_balanced.c +++ b/check_balanced.c @@ -118,7 +118,7 @@ static void check_possible(struct sm_state *sm) static void match_return(struct expression *expr) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; if (__inline_fn) diff --git a/check_debug.c b/check_debug.c index 2acfdab7..8a0319cf 100644 --- a/check_debug.c +++ b/check_debug.c @@ -24,7 +24,7 @@ static int my_id; static void match_all_values(const char *fn, struct expression *expr, void *info) { - struct AVL *stree; + struct stree *stree; stree = get_all_states_stree(SMATCH_EXTRA); __print_stree(stree); @@ -91,7 +91,7 @@ static void match_states(const char *fn, struct expression *expr, void *info) static void match_print_value(const char *fn, struct expression *expr, void *info) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; struct expression *arg_expr; @@ -267,7 +267,7 @@ static void print_possible(struct sm_state *sm) static void match_possible(const char *fn, struct expression *expr, void *info) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; struct expression *arg_expr; @@ -360,7 +360,7 @@ static void print_related(struct sm_state *sm) static void match_dump_related(const char *fn, struct expression *expr, void *info) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; stree = get_all_states_stree(SMATCH_EXTRA); diff --git a/check_dereferences_param.c b/check_dereferences_param.c index 5254702d..3317390f 100644 --- a/check_dereferences_param.c +++ b/check_dereferences_param.c @@ -99,7 +99,7 @@ static void set_param_dereferenced(struct expression *arg, char *unused) check_deref(arg); } -static void process_states(struct AVL *stree) +static void process_states(struct stree *stree) { struct symbol *arg; int i; diff --git a/check_double_checking.c b/check_double_checking.c index 36dcbace..e5c5c785 100644 --- a/check_double_checking.c +++ b/check_double_checking.c @@ -23,7 +23,7 @@ static int my_id; STATE(checked); STATE(modified); -struct AVL *to_check; +struct stree *to_check; static void set_modified(struct sm_state *sm, struct expression *mod_expr) { diff --git a/check_frees_argument.c b/check_frees_argument.c index 52ab298d..31d157b8 100644 --- a/check_frees_argument.c +++ b/check_frees_argument.c @@ -66,7 +66,7 @@ static void match_kfree(const char *fn, struct expression *expr, void *info) static int return_count = 0; static void match_return(struct expression *ret_value) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; struct tracker *tracker; diff --git a/check_frees_param.c b/check_frees_param.c index f3c971db..828d7506 100644 --- a/check_frees_param.c +++ b/check_frees_param.c @@ -95,7 +95,7 @@ static void set_param_freed(struct expression *arg, char *unused) freed_variable(arg); } -static void process_states(struct AVL *stree) +static void process_states(struct stree *stree) { struct symbol *arg; int i; diff --git a/check_held_dev.c b/check_held_dev.c index c2d08b91..c27c5a4f 100644 --- a/check_held_dev.c +++ b/check_held_dev.c @@ -65,7 +65,7 @@ static void match_returns_null(const char *fn, struct expression *call_expr, static void check_for_held(void) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; stree = get_all_states_stree(my_id); diff --git a/check_leaks.c b/check_leaks.c index 7af53797..b331689c 100644 --- a/check_leaks.c +++ b/check_leaks.c @@ -211,7 +211,7 @@ static void match_assign(struct expression *expr) static void check_for_allocated(void) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; stree = get_all_states_stree(my_id); diff --git a/check_locking.c b/check_locking.c index 3cb03e06..0ce30862 100644 --- a/check_locking.c +++ b/check_locking.c @@ -603,7 +603,7 @@ static void check_possible(struct sm_state *sm) static void match_return(int return_id, char *return_ranges, struct expression *expr) { struct locks_on_return *ret; - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; if (!final_pass) @@ -877,7 +877,7 @@ static void load_table(struct lock_info *_lock_table, int size) /* print_held_locks() is used in check_call_tree.c */ void print_held_locks() { - struct AVL *stree; + struct stree *stree; struct sm_state *sm; int i = 0; diff --git a/check_memory.c b/check_memory.c index cb42676f..0b00e2cd 100644 --- a/check_memory.c +++ b/check_memory.c @@ -312,7 +312,7 @@ static void match_declarations(struct symbol *sym) static void check_for_allocated(void) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; stree = get_all_states_stree(my_id); diff --git a/check_puts_argument.c b/check_puts_argument.c index f9e90434..9c1fe900 100644 --- a/check_puts_argument.c +++ b/check_puts_argument.c @@ -63,7 +63,7 @@ static void match_put(const char *fn, struct expression *expr, void *info) static int return_count = 0; static void match_return(struct expression *ret_value) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; struct tracker *tracker; diff --git a/check_return_enomem.c b/check_return_enomem.c index 25b2fb98..80d77a19 100644 --- a/check_return_enomem.c +++ b/check_return_enomem.c @@ -51,7 +51,7 @@ static void allocation_failed(const char *fn, struct expression *call_expr, static void match_return(struct expression *ret_value) { struct sm_state *sm; - struct AVL *stree; + struct stree *stree; sval_t sval; if (!ret_value) diff --git a/check_template.c b/check_template.c index 591e5caa..e1cafa8a 100644 --- a/check_template.c +++ b/check_template.c @@ -85,7 +85,7 @@ free_fn: static void match_return(struct expression *ret_value) { sval_t ret_val; - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; if (!get_value(ret_value, &ret_val) || sval_cmp_val(ret_val, 0) >= 0) diff --git a/check_unwind.c b/check_unwind.c index 96c40790..99559e5d 100644 --- a/check_unwind.c +++ b/check_unwind.c @@ -127,7 +127,7 @@ static int func_returns_int() static void match_return(struct expression *ret_value) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; sval_t sval; diff --git a/check_user_data.c b/check_user_data.c index 40b2c243..851a4836 100644 --- a/check_user_data.c +++ b/check_user_data.c @@ -55,7 +55,7 @@ int is_user_macro(struct expression *expr) return 0; } -static int has_user_data_state(struct expression *expr, struct AVL *my_stree) +static int has_user_data_state(struct expression *expr, struct stree *my_stree) { struct sm_state *sm; struct symbol *sym; @@ -79,7 +79,7 @@ static int has_user_data_state(struct expression *expr, struct AVL *my_stree) static int passes_user_data(struct expression *expr) { - struct AVL *stree; + struct stree *stree; struct expression *arg; stree = get_all_states_stree(my_id); @@ -186,7 +186,7 @@ static int in_container_of_macro(struct expression *expr) static int is_user_data_state(struct expression *expr) { - struct AVL *stree = NULL; + struct stree *stree = NULL; struct sm_state *tmp; struct symbol *sym; char *name; @@ -477,7 +477,7 @@ static void returned_member_callback(int return_id, char *return_ranges, char *p static void print_returned_user_data(int return_id, char *return_ranges, struct expression *expr) { - struct AVL *stree; + struct stree *stree; struct sm_state *tmp; int param; int user_data; diff --git a/smatch.h b/smatch.h index 1ca9d451..ff817b55 100644 --- a/smatch.h +++ b/smatch.h @@ -76,7 +76,7 @@ struct sm_state { unsigned int nr_children; unsigned int line; struct smatch_state *state; - struct AVL *pool; + struct stree *pool; struct sm_state *left; struct sm_state *right; struct state_list *possible; @@ -248,9 +248,9 @@ void set_true_false_states_expr(int owner, struct expression *expr, struct smatch_state *true_state, struct smatch_state *false_state); -struct AVL *get_all_states_from_stree(int owner, struct AVL *source); -struct AVL *get_all_states_stree(int id); -struct AVL *__get_cur_stree(void); +struct stree *get_all_states_from_stree(int owner, struct stree *source); +struct stree *get_all_states_stree(int id); +struct stree *__get_cur_stree(void); int is_reachable(void); /* smatch_helper.c */ @@ -414,10 +414,10 @@ extern int option_debug_implied; extern int option_debug_related; extern int option_no_implied; struct range_list_stack; -struct AVL *__implied_case_stree(struct expression *switch_expr, +struct stree *__implied_case_stree(struct expression *switch_expr, struct expression *case_expr, struct range_list_stack **remaining_cases, - struct AVL **raw_stree); + struct stree **raw_stree); struct range_list *__get_implied_values(struct expression *switch_expr); void overwrite_states_using_pool(struct sm_state *sm); @@ -454,12 +454,12 @@ int get_db_type_rl(struct expression *expr, struct range_list **rl); /* smatch_states.c */ void __push_fake_cur_slist(); -struct AVL *__pop_fake_cur_slist(); +struct stree *__pop_fake_cur_slist(); void __free_fake_cur_slist(); void __pop_fake_cur_slist_fast(void); -void __set_fake_cur_stree_fast(struct AVL *stree); +void __set_fake_cur_stree_fast(struct stree *stree); void __pop_fake_cur_stree_fast(void); -void __merge_stree_into_cur(struct AVL *stree); +void __merge_stree_into_cur(struct stree *stree); int unreachable(void); void __set_sm(struct sm_state *sm); @@ -489,10 +489,10 @@ void __use_pre_cond_states(void); void __use_cond_true_states(void); void __use_cond_false_states(void); void __push_cond_stacks(void); -struct AVL *__copy_cond_true_states(void); -struct AVL *__copy_cond_false_states(void); -struct AVL *__pop_cond_true_stack(void); -struct AVL *__pop_cond_false_stack(void); +struct stree *__copy_cond_true_states(void); +struct stree *__copy_cond_false_states(void); +struct stree *__pop_cond_true_stack(void); +struct stree *__pop_cond_false_stack(void); void __and_cond_states(void); void __or_cond_states(void); void __save_pre_cond_states(void); @@ -731,7 +731,7 @@ int is_uninitialized(struct expression *expr); int has_uninitialized_members(struct expression *expr); /* smatch_start_states.c */ -struct AVL *get_start_states(void); +struct stree *get_start_states(void); /* smatch_recurse.c */ int has_symbol(struct expression *expr, struct symbol *sym); diff --git a/smatch_comparison.c b/smatch_comparison.c index 454fd4b7..de16674b 100644 --- a/smatch_comparison.c +++ b/smatch_comparison.c @@ -637,7 +637,7 @@ done: free_string(var); } -static void update_tf_links(struct AVL *pre_stree, +static void update_tf_links(struct stree *pre_stree, const char *left_var, struct var_sym_list *left_vsl, int left_comparison, const char *mid_var, struct var_sym_list *mid_vsl, @@ -710,7 +710,7 @@ static void update_tf_links(struct AVL *pre_stree, } END_FOR_EACH_PTR(tmp); } -static void update_tf_data(struct AVL *pre_stree, +static void update_tf_data(struct stree *pre_stree, const char *left_name, struct symbol *left_sym, const char *right_name, struct symbol *right_sym, struct compare_data *tdata) @@ -735,7 +735,7 @@ static void match_compare(struct expression *expr) int op, false_op; struct smatch_state *true_state, *false_state; char state_name[256]; - struct AVL *pre_stree; + struct stree *pre_stree; if (expr->type != EXPR_COMPARE) return; diff --git a/smatch_conditions.c b/smatch_conditions.c index 0de3d2a7..95fdf007 100644 --- a/smatch_conditions.c +++ b/smatch_conditions.c @@ -190,9 +190,9 @@ static void handle_logical(struct expression *expr) __use_cond_true_states(); } -static struct AVL *combine_strees(struct AVL *orig, struct AVL *fake, struct AVL *new) +static struct stree *combine_strees(struct stree *orig, struct stree *fake, struct stree *new) { - struct AVL *ret = NULL; + struct stree *ret = NULL; overwrite_stree(orig, &ret); overwrite_stree(fake, &ret); @@ -215,14 +215,14 @@ static struct AVL *combine_strees(struct AVL *orig, struct AVL *fake, struct AVL static void handle_select(struct expression *expr) { - struct AVL *a_T = NULL; - struct AVL *a_F = NULL; - struct AVL *a_T_b_T = NULL; - struct AVL *a_T_b_F = NULL; - struct AVL *a_T_b_fake = NULL; - struct AVL *a_F_c_T = NULL; - struct AVL *a_F_c_F = NULL; - struct AVL *a_F_c_fake = NULL; + struct stree *a_T = NULL; + struct stree *a_F = NULL; + struct stree *a_T_b_T = NULL; + struct stree *a_T_b_F = NULL; + struct stree *a_T_b_fake = NULL; + struct stree *a_F_c_T = NULL; + struct stree *a_F_c_F = NULL; + struct stree *a_F_c_fake = NULL; struct sm_state *sm; /* @@ -526,7 +526,7 @@ static void set_fake_assign(struct expression *new, int __handle_select_assigns(struct expression *expr) { struct expression *right; - struct AVL *final_states = NULL; + struct stree *final_states = NULL; struct sm_state *sm; int is_true; int is_false; diff --git a/smatch_db.c b/smatch_db.c index 7a067f58..2a67ede7 100644 --- a/smatch_db.c +++ b/smatch_db.c @@ -443,7 +443,7 @@ static void match_call_marker(struct expression *expr) sql_insert_caller_info(expr, INTERNAL, -1, "%call_marker%", ""); } -static void print_struct_members(struct expression *call, struct expression *expr, int param, struct AVL *stree, +static void print_struct_members(struct expression *call, struct expression *expr, int param, struct stree *stree, void (*callback)(struct expression *call, int param, char *printed_name, struct smatch_state *state)) { struct sm_state *sm; @@ -492,7 +492,7 @@ static void match_call_info(struct expression *call) { struct member_info_callback *cb; struct expression *arg; - struct AVL *stree; + struct stree *stree; char *name; int i; @@ -541,7 +541,7 @@ static int get_param(int param, char **name, struct symbol **sym) return FALSE; } -static struct AVL *final_states; +static struct stree *final_states; static int prev_func_id = -1; static int db_callback(void *unused, int argc, char **argv, char **azColName) { @@ -551,7 +551,7 @@ static int db_callback(void *unused, int argc, char **argv, char **azColName) char *name = NULL; struct symbol *sym = NULL; struct def_callback *def_callback; - struct AVL *stree; + struct stree *stree; if (argc != 5) return 0; @@ -664,7 +664,7 @@ static void get_function_pointer_callers(struct symbol *sym) static void match_data_from_db(struct symbol *sym) { struct sm_state *sm; - struct AVL *stree; + struct stree *stree; if (!sym || !sym->ident || !sym->ident->name) return; @@ -984,7 +984,7 @@ static void call_return_state_hooks(struct expression *expr) static void print_returned_struct_members(int return_id, char *return_ranges, struct expression *expr) { struct returned_member_callback *cb; - struct AVL *my_stree; + struct stree *my_stree; struct sm_state *sm; struct symbol *type; char *name; diff --git a/smatch_extra.c b/smatch_extra.c index 6645c1c7..185ce3d1 100644 --- a/smatch_extra.c +++ b/smatch_extra.c @@ -336,7 +336,7 @@ static struct sm_state *handle_canonical_for_loops(struct statement *loop) return NULL; } -struct sm_state *__extra_handle_canonical_loops(struct statement *loop, struct AVL **stree) +struct sm_state *__extra_handle_canonical_loops(struct statement *loop, struct stree **stree) { struct sm_state *ret; @@ -423,7 +423,7 @@ void __extra_pre_loop_hook_after(struct sm_state *sm, set_extra_mod(sm->name, sm->sym, state); } -static struct AVL *unmatched_stree; +static struct stree *unmatched_stree; static struct smatch_state *unmatched_state(struct sm_state *sm) { struct smatch_state *state; @@ -436,7 +436,7 @@ static struct smatch_state *unmatched_state(struct sm_state *sm) return alloc_estate_whole(estate_type(sm->state)); } -static void clear_the_pointed_at(struct expression *expr, struct AVL *stree) +static void clear_the_pointed_at(struct expression *expr, struct stree *stree) { char *name; struct symbol *sym; @@ -464,7 +464,7 @@ static void match_function_call(struct expression *expr) { struct expression *arg; struct expression *tmp; - struct AVL *stree; + struct stree *stree; /* if we have the db this is handled in smatch_function_hooks.c */ if (!option_no_db) diff --git a/smatch_extra.h b/smatch_extra.h index f9b5d13d..768daff8 100644 --- a/smatch_extra.h +++ b/smatch_extra.h @@ -144,7 +144,7 @@ struct data_info *get_dinfo(struct smatch_state *state); void add_extra_mod_hook(void (*fn)(const char *name, struct symbol *sym, struct smatch_state *state)); int implied_not_equal(struct expression *expr, long long val); -struct sm_state *__extra_handle_canonical_loops(struct statement *loop, struct AVL **stree); +struct sm_state *__extra_handle_canonical_loops(struct statement *loop, struct stree **stree); int __iterator_unchanged(struct sm_state *sm); void __extra_pre_loop_hook_after(struct sm_state *sm, struct statement *iterator, diff --git a/smatch_flow.c b/smatch_flow.c index f9e01f7e..823ba52b 100644 --- a/smatch_flow.c +++ b/smatch_flow.c @@ -363,7 +363,7 @@ static void handle_pre_loop(struct statement *stmt) struct sm_state *extra_sm = NULL; int unchanged = 0; char *loop_name; - struct AVL *stree = NULL; + struct stree *stree = NULL; struct sm_state *sm = NULL; loop_name = get_loop_name(loop_num); diff --git a/smatch_function_hooks.c b/smatch_function_hooks.c index 7fadf4ef..5d80f0d4 100644 --- a/smatch_function_hooks.c +++ b/smatch_function_hooks.c @@ -239,8 +239,8 @@ static int assign_ranged_funcs(const char *fn, struct expression *expr, char *var_name; struct symbol *sym; struct smatch_state *estate; - struct AVL *tmp_stree; - struct AVL *final_states = NULL; + struct stree *tmp_stree; + struct stree *final_states = NULL; struct range_list *handled_ranges = NULL; struct call_back_list *same_range_call_backs = NULL; int handled = 0; @@ -290,9 +290,9 @@ static int call_implies_callbacks(int comparison, struct expression *expr, sval_ struct fcall_back *tmp; const char *fn; struct data_range *value_range; - struct AVL *true_states = NULL; - struct AVL *false_states = NULL; - struct AVL *tmp_stree; + struct stree *true_states = NULL; + struct stree *false_states = NULL; + struct stree *tmp_stree; struct sm_state *sm; if (expr->fn->type != EXPR_SYMBOL || !expr->fn->symbol) @@ -347,7 +347,7 @@ struct db_callback_info { struct expression *expr; struct range_list *rl; int left; - struct AVL *stree; + struct stree *stree; struct db_implies_list *callbacks; }; static struct db_callback_info db_info; @@ -389,8 +389,8 @@ static int db_compare_callback(void *unused, int argc, char **argv, char **azCol void compare_db_return_states_callbacks(int comparison, struct expression *expr, sval_t sval, int left) { - struct AVL *true_states; - struct AVL *false_states; + struct stree *true_states; + struct stree *false_states; struct sm_state *sm; if (expr->fn->type != EXPR_SYMBOL || !expr->fn->symbol) @@ -445,7 +445,7 @@ static int db_assign_return_states_callback(void *unused, int argc, char **argv, int type, param; char *key, *value; struct return_implies_callback *tmp; - struct AVL *stree; + struct stree *stree; int return_id; if (argc != 6) @@ -484,7 +484,7 @@ static int db_return_states_assign(struct expression *expr) { struct expression *right; struct sm_state *sm; - struct AVL *stree; + struct stree *stree; int handled = 0; right = strip_expr(expr->right); @@ -577,7 +577,7 @@ static int db_return_states_callback(void *unused, int argc, char **argv, char * int type, param; char *key, *value; struct return_implies_callback *tmp; - struct AVL *stree; + struct stree *stree; int return_id; if (argc != 6) @@ -611,7 +611,7 @@ static int db_return_states_callback(void *unused, int argc, char **argv, char * static void db_return_states(struct expression *expr) { struct sm_state *sm; - struct AVL *stree; + struct stree *stree; if (expr->fn->type != EXPR_SYMBOL || !expr->fn->symbol) return; diff --git a/smatch_implied.c b/smatch_implied.c index b7a269a5..44c8263f 100644 --- a/smatch_implied.c +++ b/smatch_implied.c @@ -111,9 +111,9 @@ static void print_debug_tf(struct sm_state *s, int istrue, int isfalse) * add_pool() adds a slist to *pools. If the slist has already been * added earlier then it doesn't get added a second time. */ -static void add_pool(struct stree_stack **pools, struct AVL *new) +static void add_pool(struct stree_stack **pools, struct stree *new) { - struct AVL *tmp; + struct stree *tmp; FOR_EACH_PTR(*pools, tmp) { if (tmp < new) @@ -176,10 +176,10 @@ static void do_compare(struct sm_state *sm_state, int comparison, struct range_l add_pool(false_stack, s->pool); } -static int pool_in_pools(struct AVL *pool, +static int pool_in_pools(struct stree *pool, struct stree_stack *pools) { - struct AVL *tmp; + struct stree *tmp; FOR_EACH_PTR(pools, tmp) { if (tmp == pool) @@ -333,11 +333,11 @@ static int highest_slist_id(struct sm_state *sm) return left; } -static struct AVL *filter_stack(struct sm_state *gate_sm, - struct AVL *pre_stree, +static struct stree *filter_stack(struct sm_state *gate_sm, + struct stree *pre_stree, struct stree_stack *stack) { - struct AVL *ret = NULL; + struct stree *ret = NULL; struct sm_state *tmp; struct sm_state *filtered_sm; int modified; @@ -368,9 +368,9 @@ static struct AVL *filter_stack(struct sm_state *gate_sm, static void separate_and_filter(struct sm_state *sm_state, int comparison, struct range_list *vals, int lr, - struct AVL *pre_stree, - struct AVL **true_states, - struct AVL **false_states) + struct stree *pre_stree, + struct stree **true_states, + struct stree **false_states) { struct stree_stack *true_stack = NULL; struct stree_stack *false_stack = NULL; @@ -436,7 +436,7 @@ static int is_merged_expr(struct expression *expr) return 0; } -static void delete_equiv_stree(struct AVL **stree, const char *name, struct symbol *sym) +static void delete_equiv_stree(struct stree **stree, const char *name, struct symbol *sym) { struct smatch_state *state; struct relation *rel; @@ -453,8 +453,8 @@ static void delete_equiv_stree(struct AVL **stree, const char *name, struct symb } static void handle_comparison(struct expression *expr, - struct AVL **implied_true, - struct AVL **implied_false) + struct stree **implied_true, + struct stree **implied_false) { struct sm_state *sm = NULL; struct range_list *ranges = NULL; @@ -487,8 +487,8 @@ static void handle_comparison(struct expression *expr, } static void handle_zero_comparison(struct expression *expr, - struct AVL **implied_true, - struct AVL **implied_false) + struct stree **implied_true, + struct stree **implied_false) { struct symbol *sym; char *name; @@ -519,8 +519,8 @@ free: } static void get_tf_states(struct expression *expr, - struct AVL **implied_true, - struct AVL **implied_false) + struct stree **implied_true, + struct stree **implied_false) { if (expr->type == EXPR_COMPARE) handle_comparison(expr, implied_true, implied_false); @@ -531,8 +531,8 @@ static void get_tf_states(struct expression *expr, static void implied_states_hook(struct expression *expr) { struct sm_state *sm; - struct AVL *implied_true = NULL; - struct AVL *implied_false = NULL; + struct stree *implied_true = NULL; + struct stree *implied_false = NULL; if (option_no_implied) return; @@ -575,18 +575,18 @@ free: return ret; } -struct AVL *__implied_case_stree(struct expression *switch_expr, +struct stree *__implied_case_stree(struct expression *switch_expr, struct expression *case_expr, struct range_list_stack **remaining_cases, - struct AVL **raw_stree) + struct stree **raw_stree) { char *name = NULL; struct symbol *sym; struct sm_state *sm; - struct AVL *true_states = NULL; - struct AVL *false_states = NULL; - struct AVL *extra_states = NULL; - struct AVL *ret = clone_stree(*raw_stree); + struct stree *true_states = NULL; + struct stree *false_states = NULL; + struct stree *extra_states = NULL; + struct stree *ret = clone_stree(*raw_stree); sval_t sval; struct range_list *vals = NULL; diff --git a/smatch_local_values.c b/smatch_local_values.c index cecc0a6c..c696f053 100644 --- a/smatch_local_values.c +++ b/smatch_local_values.c @@ -104,7 +104,7 @@ static void extra_mod_hook(const char *name, struct symbol *sym, struct smatch_s set_state(my_id, name, sym, new); } -static void process_states(struct AVL *stree) +static void process_states(struct stree *stree) { struct sm_state *sm; struct smatch_state *extra; diff --git a/smatch_modification_hooks.c b/smatch_modification_hooks.c index 1d5a1bc1..f39c3b9e 100644 --- a/smatch_modification_hooks.c +++ b/smatch_modification_hooks.c @@ -80,7 +80,7 @@ static int matches(char *name, struct symbol *sym, struct sm_state *sm) static void call_modification_hooks_name_sym(char *name, struct symbol *sym, struct expression *mod_expr) { - struct AVL *stree; + struct stree *stree; struct sm_state *sm; int match; diff --git a/smatch_param_cleared.c b/smatch_param_cleared.c index 0f63c42d..8cc2d832 100644 --- a/smatch_param_cleared.c +++ b/smatch_param_cleared.c @@ -70,7 +70,7 @@ static void match_memcpy(const char *fn, struct expression *expr, void *arg) static void print_return_value_param(int return_id, char *return_ranges, struct expression *expr) { - struct AVL *stree; + struct stree *stree; struct sm_state *sm; int param; diff --git a/smatch_param_filter.c b/smatch_param_filter.c index d3c02ed5..53d0abec 100644 --- a/smatch_param_filter.c +++ b/smatch_param_filter.c @@ -38,7 +38,7 @@ static int my_id; STATE(modified); STATE(original); -static struct AVL *start_states; +static struct stree *start_states; static struct stree_stack *saved_stack; static void save_start_states(struct statement *stmt) { @@ -135,7 +135,7 @@ static void print_one_extra_param(int return_id, char *return_ranges, static void print_return_value_param(int return_id, char *return_ranges, struct expression *expr) { - struct AVL *extra_stree; + struct stree *extra_stree; struct sm_state *tmp; struct sm_state *sm; int param; diff --git a/smatch_param_limit.c b/smatch_param_limit.c index 0c6c4061..ee25ba8f 100644 --- a/smatch_param_limit.c +++ b/smatch_param_limit.c @@ -43,7 +43,7 @@ static int my_id; STATE(original); -static struct AVL *start_states; +static struct stree *start_states; static struct stree_stack *saved_stack; static void save_start_states(struct statement *stmt) @@ -102,7 +102,7 @@ struct smatch_state *get_orig_estate(const char *name, struct symbol *sym) static void print_return_value_param(int return_id, char *return_ranges, struct expression *expr) { - struct AVL *extra_stree; + struct stree *extra_stree; struct sm_state *tmp; struct sm_state *my_sm; struct smatch_state *state; diff --git a/smatch_param_set.c b/smatch_param_set.c index 10be438d..5971ff77 100644 --- a/smatch_param_set.c +++ b/smatch_param_set.c @@ -66,7 +66,7 @@ static void print_one_return_value_param(int return_id, char *return_ranges, static void print_return_value_param(int return_id, char *return_ranges, struct expression *expr) { - struct AVL *stree; + struct stree *stree; struct sm_state *sm; struct smatch_state *extra; int param; diff --git a/smatch_returns.c b/smatch_returns.c index b0d029db..637fc96d 100644 --- a/smatch_returns.c +++ b/smatch_returns.c @@ -21,16 +21,16 @@ static int my_id; struct return_states_callback { - void (*callback)(struct AVL *stree); + void (*callback)(struct stree *stree); }; ALLOCATOR(return_states_callback, "return states callbacks"); DECLARE_PTR_LIST(callback_list, struct return_states_callback); static struct callback_list *callback_list; -static struct AVL *all_return_states; +static struct stree *all_return_states; static struct stree_stack *saved_stack; -void all_return_states_hook(void (*callback)(struct AVL *stree)) +void all_return_states_hook(void (*callback)(struct stree *stree)) { struct return_states_callback *rs_cb = __alloc_return_states_callback(0); diff --git a/smatch_slist.c b/smatch_slist.c index 34ecc5c1..f91235a0 100644 --- a/smatch_slist.c +++ b/smatch_slist.c @@ -62,7 +62,7 @@ truncate: return buf; } -void __print_stree(struct AVL *stree) +void __print_stree(struct stree *stree) { struct sm_state *sm; @@ -391,7 +391,7 @@ struct sm_state *merge_sm_states(struct sm_state *one, struct sm_state *two) return result; } -struct sm_state *get_sm_state_stree(struct AVL *stree, int owner, const char *name, +struct sm_state *get_sm_state_stree(struct stree *stree, int owner, const char *name, struct symbol *sym) { struct tracker tracker = { @@ -407,7 +407,7 @@ struct sm_state *get_sm_state_stree(struct AVL *stree, int owner, const char *na return avl_lookup(stree, (struct sm_state *)&tracker); } -struct smatch_state *get_state_stree(struct AVL *stree, +struct smatch_state *get_state_stree(struct stree *stree, int owner, const char *name, struct symbol *sym) { @@ -420,7 +420,7 @@ struct smatch_state *get_state_stree(struct AVL *stree, } /* FIXME: this is almost exactly the same as set_sm_state_slist() */ -void overwrite_sm_state_stree(struct AVL **stree, struct sm_state *new) +void overwrite_sm_state_stree(struct stree **stree, struct sm_state *new) { avl_insert(stree, new); } @@ -428,14 +428,14 @@ void overwrite_sm_state_stree(struct AVL **stree, struct sm_state *new) void overwrite_sm_state_stree_stack(struct stree_stack **stack, struct sm_state *sm) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(stack); overwrite_sm_state_stree(&stree, sm); push_stree(stack, stree); } -struct sm_state *set_state_stree(struct AVL **stree, int owner, const char *name, +struct sm_state *set_state_stree(struct stree **stree, int owner, const char *name, struct symbol *sym, struct smatch_state *state) { struct sm_state *new = alloc_sm_state(owner, name, sym, state); @@ -444,7 +444,7 @@ struct sm_state *set_state_stree(struct AVL **stree, int owner, const char *name return new; } -void delete_state_stree(struct AVL **stree, int owner, const char *name, +void delete_state_stree(struct stree **stree, int owner, const char *name, struct symbol *sym) { struct tracker tracker = { @@ -459,21 +459,21 @@ void delete_state_stree(struct AVL **stree, int owner, const char *name, void delete_state_stree_stack(struct stree_stack **stack, int owner, const char *name, struct symbol *sym) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(stack); delete_state_stree(&stree, owner, name, sym); push_stree(stack, stree); } -void push_stree(struct stree_stack **stack, struct AVL *stree) +void push_stree(struct stree_stack **stack, struct stree *stree) { add_ptr_list(stack, stree); } -struct AVL *pop_stree(struct stree_stack **stack) +struct stree *pop_stree(struct stree_stack **stack) { - struct AVL *stree; + struct stree *stree; stree = last_ptr_list((struct ptr_list *)*stack); delete_ptr_list_last((struct ptr_list **)stack); @@ -485,7 +485,7 @@ void free_slist(struct state_list **slist) __free_ptr_list((struct ptr_list **)slist); } -void free_stree(struct AVL **stree) +void free_stree(struct stree **stree) { avl_free(stree); } @@ -497,7 +497,7 @@ void free_stree_stack(struct stree_stack **stack) void free_stack_and_strees(struct stree_stack **stree_stack) { - struct AVL *stree; + struct stree *stree; FOR_EACH_PTR(*stree_stack, stree) { free_stree(&stree); @@ -508,7 +508,7 @@ void free_stack_and_strees(struct stree_stack **stree_stack) struct sm_state *set_state_stree_stack(struct stree_stack **stack, int owner, const char *name, struct symbol *sym, struct smatch_state *state) { - struct AVL *stree; + struct stree *stree; struct sm_state *sm; stree = pop_stree(stack); @@ -525,7 +525,7 @@ struct sm_state *get_sm_state_stree_stack(struct stree_stack *stack, int owner, const char *name, struct symbol *sym) { - struct AVL *stree; + struct stree *stree; struct sm_state *ret; stree = pop_stree(&stack); @@ -546,12 +546,12 @@ struct smatch_state *get_state_stree_stack(struct stree_stack *stack, return NULL; } -static void match_states_stree(struct AVL **one, struct AVL **two) +static void match_states_stree(struct stree **one, struct stree **two) { struct smatch_state *tmp_state; struct sm_state *tmp_sm; - struct AVL *add_to_one = NULL; - struct AVL *add_to_two = NULL; + struct stree *add_to_one = NULL; + struct stree *add_to_two = NULL; AvlIter one_iter; AvlIter two_iter; @@ -587,7 +587,7 @@ static void match_states_stree(struct AVL **one, struct AVL **two) overwrite_stree(add_to_two, two); } -static void clone_pool_havers_stree(struct AVL *stree) +static void clone_pool_havers_stree(struct stree *stree) { struct AvlIter iter; @@ -601,13 +601,13 @@ int __slist_id; /* * Sets the first state to the slist_id. */ -static void set_stree_id(struct AVL *stree) +static void set_stree_id(struct stree *stree) { struct smatch_state *state; struct sm_state *new; /* FIXME: This is horrible. Anyway, slist_id should be a part of the - AVL pointer */ + stree pointer */ state = alloc_state_num(++__slist_id); new = alloc_sm_state(-1, "unnull_path", NULL, state); @@ -617,7 +617,7 @@ static void set_stree_id(struct AVL *stree) avl_insert(&stree, new); } -int get_stree_id(struct AVL *stree) +int get_stree_id(struct stree *stree) { struct sm_state *sm; @@ -631,11 +631,11 @@ int get_stree_id(struct AVL *stree) * merge_slist() is called whenever paths merge, such as after * an if statement. It takes the two slists and creates one. */ -void merge_stree(struct AVL **to, struct AVL *stree) +void merge_stree(struct stree **to, struct stree *stree) { - struct AVL *results = NULL; - struct AVL *implied_one = NULL; - struct AVL *implied_two = NULL; + struct stree *results = NULL; + struct stree *implied_one = NULL; + struct stree *implied_two = NULL; AvlIter one_iter; AvlIter two_iter; struct sm_state *tmp_sm; @@ -694,9 +694,9 @@ void merge_stree(struct AVL **to, struct AVL *stree) /* * filter_slist() removes any sm states "slist" holds in common with "filter" */ -void filter_stree(struct AVL **stree, struct AVL *filter) +void filter_stree(struct stree **stree, struct stree *filter) { - struct AVL *results = NULL; + struct stree *results = NULL; AvlIter one_iter; AvlIter two_iter; @@ -733,7 +733,7 @@ void filter_stree(struct AVL **stree, struct AVL *filter) void and_stree_stack(struct stree_stack **stack) { struct sm_state *tmp; - struct AVL *right_stree = pop_stree(stack); + struct stree *right_stree = pop_stree(stack); FOR_EACH_SM(right_stree, tmp) { overwrite_sm_state_stree_stack(stack, tmp); @@ -750,14 +750,14 @@ void and_stree_stack(struct stree_stack **stack) * It's this function which ensures smatch does the right thing. */ void or_stree_stack(struct stree_stack **pre_conds, - struct AVL *cur_stree, + struct stree *cur_stree, struct stree_stack **stack) { - struct AVL *new; - struct AVL *old; - struct AVL *pre_stree; - struct AVL *res; - struct AVL *tmp_stree; + struct stree *new; + struct stree *old; + struct stree *pre_stree; + struct stree *res; + struct stree *tmp_stree; new = pop_stree(stack); old = pop_stree(stack); @@ -784,7 +784,7 @@ void or_stree_stack(struct stree_stack **pre_conds, /* * get_named_stree() is only used for gotos. */ -struct AVL **get_named_stree(struct named_stree_stack *stack, +struct stree **get_named_stree(struct named_stree_stack *stack, const char *name) { struct named_stree *tmp; @@ -797,7 +797,7 @@ struct AVL **get_named_stree(struct named_stree_stack *stack, } /* FIXME: These parameters are in a different order from expected */ -void overwrite_stree(struct AVL *from, struct AVL **to) +void overwrite_stree(struct stree *from, struct stree **to) { struct sm_state *tmp; diff --git a/smatch_slist.h b/smatch_slist.h index 84571288..f92cf9c7 100644 --- a/smatch_slist.h +++ b/smatch_slist.h @@ -1,12 +1,12 @@ -struct AVL; +struct stree; DECLARE_PTR_LIST(state_list, struct sm_state); DECLARE_PTR_LIST(state_list_stack, struct state_list); -DECLARE_PTR_LIST(stree_stack, struct AVL); +DECLARE_PTR_LIST(stree_stack, struct stree); struct named_stree { char *name; - struct AVL *stree; + struct stree *stree; }; DECLARE_ALLOCATOR(named_stree); DECLARE_PTR_LIST(named_stree_stack, struct named_stree); @@ -16,7 +16,7 @@ extern struct state_list_stack *implied_pools; extern int __slist_id; char *show_sm(struct sm_state *sm); -void __print_stree(struct AVL *stree); +void __print_stree(struct stree *stree); void add_history(struct sm_state *sm); int cmp_tracker(const struct sm_state *a, const struct sm_state *b); char *alloc_sname(const char *str); @@ -35,28 +35,28 @@ struct smatch_state *merge_states(int owner, const char *name, int too_many_possible(struct sm_state *sm); struct sm_state *merge_sm_states(struct sm_state *one, struct sm_state *two); -struct smatch_state *get_state_stree(struct AVL *stree, int owner, const char *name, +struct smatch_state *get_state_stree(struct stree *stree, int owner, const char *name, struct symbol *sym); -struct sm_state *get_sm_state_stree(struct AVL *stree, int owner, const char *name, +struct sm_state *get_sm_state_stree(struct stree *stree, int owner, const char *name, struct symbol *sym); -void overwrite_sm_state_stree(struct AVL **stree, struct sm_state *sm); +void overwrite_sm_state_stree(struct stree **stree, struct sm_state *sm); void overwrite_sm_state_stree_stack(struct stree_stack **stack, struct sm_state *sm); -struct sm_state *set_state_stree(struct AVL **stree, int owner, const char *name, +struct sm_state *set_state_stree(struct stree **stree, int owner, const char *name, struct symbol *sym, struct smatch_state *state); -void delete_state_stree(struct AVL **stree, int owner, const char *name, +void delete_state_stree(struct stree **stree, int owner, const char *name, struct symbol *sym); void delete_state_stree_stack(struct stree_stack **stack, int owner, const char *name, struct symbol *sym); -void push_stree(struct stree_stack **list_stack, struct AVL *stree); -struct AVL *pop_stree(struct stree_stack **list_stack); +void push_stree(struct stree_stack **list_stack, struct stree *stree); +struct stree *pop_stree(struct stree_stack **list_stack); void free_slist(struct state_list **slist); -void free_stree(struct AVL **stree); +void free_stree(struct stree **stree); void free_stree_stack(struct stree_stack **stack); void free_stack_and_strees(struct stree_stack **stree_stack); @@ -68,22 +68,22 @@ struct smatch_state *get_state_stree_stack(struct stree_stack *stack, int owner, int out_of_memory(void); int low_on_memory(void); -void merge_stree(struct AVL **to, struct AVL *stree); -void filter_stree(struct AVL **stree, struct AVL *filter); +void merge_stree(struct stree **to, struct stree *stree); +void filter_stree(struct stree **stree, struct stree *filter); void and_stree_stack(struct stree_stack **stree_stack); void or_stree_stack(struct stree_stack **pre_conds, - struct AVL *cur_stree, + struct stree *cur_stree, struct stree_stack **stack); -struct AVL **get_named_stree(struct named_stree_stack *stack, +struct stree **get_named_stree(struct named_stree_stack *stack, const char *name); -void overwrite_stree(struct AVL *from, struct AVL **to); +void overwrite_stree(struct stree *from, struct stree **to); /* add stuff smatch_returns.c here */ -void all_return_states_hook(void (*callback)(struct AVL *slist)); +void all_return_states_hook(void (*callback)(struct stree *slist)); -int get_stree_id(struct AVL *slist); +int get_stree_id(struct stree *slist); diff --git a/smatch_start_states.c b/smatch_start_states.c index 1025ac42..cfd0315c 100644 --- a/smatch_start_states.c +++ b/smatch_start_states.c @@ -26,7 +26,7 @@ static int my_id; -static struct AVL *start_states; +static struct stree *start_states; static struct stree_stack *saved_stack; static void save_start_states(struct statement *stmt) { @@ -50,7 +50,7 @@ static void match_end_func(void) free_stree(&start_states); } -struct AVL *get_start_states(void) +struct stree *get_start_states(void) { return start_states; } diff --git a/smatch_states.c b/smatch_states.c index 01c96555..dc84c96d 100644 --- a/smatch_states.c +++ b/smatch_states.c @@ -42,7 +42,7 @@ struct smatch_state merged = { .name = "merged" }; struct smatch_state true_state = { .name = "true" }; struct smatch_state false_state = { .name = "false" }; -static struct AVL *cur_stree; /* current states */ +static struct stree *cur_stree; /* current states */ static struct stree_stack *true_stack; /* states after a t/f branch */ static struct stree_stack *false_stack; @@ -164,7 +164,7 @@ void __push_fake_cur_slist() __save_pre_cond_states(); } -struct AVL *__pop_fake_cur_slist() +struct stree *__pop_fake_cur_slist() { __use_pre_cond_states(); return pop_stree(&fake_cur_stree_stack); @@ -172,14 +172,14 @@ struct AVL *__pop_fake_cur_slist() void __free_fake_cur_slist() { - struct AVL *stree; + struct stree *stree; __use_pre_cond_states(); stree = pop_stree(&fake_cur_stree_stack); free_stree(&stree); } -void __set_fake_cur_stree_fast(struct AVL *stree) +void __set_fake_cur_stree_fast(struct stree *stree) { push_stree(&pre_cond_stack, cur_stree); cur_stree = stree; @@ -198,7 +198,7 @@ void __pop_fake_cur_stree_fast() read_only = 0; } -void __merge_stree_into_cur(struct AVL *stree) +void __merge_stree_into_cur(struct stree *stree) { struct sm_state *sm; struct sm_state *orig; @@ -340,9 +340,9 @@ free: free_string(name); } -struct AVL *get_all_states_from_stree(int owner, struct AVL *source) +struct stree *get_all_states_from_stree(int owner, struct stree *source) { - struct AVL *ret = NULL; + struct stree *ret = NULL; struct sm_state *tmp; FOR_EACH_SM(source, tmp) { @@ -353,12 +353,12 @@ struct AVL *get_all_states_from_stree(int owner, struct AVL *source) return ret; } -struct AVL *get_all_states_stree(int owner) +struct stree *get_all_states_stree(int owner) { return get_all_states_from_stree(owner, cur_stree); } -struct AVL *__get_cur_stree(void) +struct stree *__get_cur_stree(void) { return cur_stree; } @@ -573,30 +573,30 @@ void __push_cond_stacks(void) push_stree(&cond_false_stack, NULL); } -struct AVL *__copy_cond_true_states(void) +struct stree *__copy_cond_true_states(void) { - struct AVL *ret; + struct stree *ret; ret = pop_stree(&cond_true_stack); push_stree(&cond_true_stack, clone_stree(ret)); return ret; } -struct AVL *__copy_cond_false_states(void) +struct stree *__copy_cond_false_states(void) { - struct AVL *ret; + struct stree *ret; ret = pop_stree(&cond_false_stack); push_stree(&cond_false_stack, clone_stree(ret)); return ret; } -struct AVL *__pop_cond_true_stack(void) +struct stree *__pop_cond_true_stack(void) { return pop_stree(&cond_true_stack); } -struct AVL *__pop_cond_false_stack(void) +struct stree *__pop_cond_false_stack(void) { return pop_stree(&cond_false_stack); } @@ -611,7 +611,7 @@ struct AVL *__pop_cond_false_stack(void) */ static void __use_cond_stack(struct stree_stack **stack) { - struct AVL *stree; + struct stree *stree; free_stree(&cur_stree); @@ -641,7 +641,7 @@ void __use_cond_false_states(void) void __negate_cond_stacks(void) { - struct AVL *old_false, *old_true; + struct stree *old_false, *old_true; __use_cond_stack(&cond_false_stack); old_false = pop_stree(&cond_false_stack); @@ -669,7 +669,7 @@ void __save_pre_cond_states(void) void __discard_pre_cond_states(void) { - struct AVL *tmp; + struct stree *tmp; tmp = pop_stree(&pre_cond_stack); free_stree(&tmp); @@ -677,7 +677,7 @@ void __discard_pre_cond_states(void) void __use_cond_states(void) { - struct AVL *pre, *pre_clone, *true_states, *false_states; + struct stree *pre, *pre_clone, *true_states, *false_states; pre = pop_stree(&pre_cond_stack); pre_clone = clone_stree(pre); @@ -706,7 +706,7 @@ void __use_false_states(void) void __discard_false_states(void) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(&false_stack); free_stree(&stree); @@ -714,7 +714,7 @@ void __discard_false_states(void) void __merge_false_states(void) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(&false_stack); merge_stree(&cur_stree, stree); @@ -723,7 +723,7 @@ void __merge_false_states(void) void __merge_true_states(void) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(&true_stack); merge_stree(&cur_stree, stree); @@ -737,7 +737,7 @@ void __push_continues(void) void __discard_continues(void) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(&continue_stack); free_stree(&stree); @@ -745,7 +745,7 @@ void __discard_continues(void) void __process_continues(void) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(&continue_stack); if (!stree) @@ -758,7 +758,7 @@ void __process_continues(void) static int top_stree_empty(struct stree_stack **stack) { - struct AVL *tmp; + struct stree *tmp; int empty = 0; tmp = pop_stree(stack); @@ -786,7 +786,7 @@ void __warn_on_silly_pre_loops(void) void __merge_continues(void) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(&continue_stack); merge_stree(&cur_stree, stree); @@ -800,7 +800,7 @@ void __push_breaks(void) void __process_breaks(void) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(&break_stack); if (!stree) @@ -813,7 +813,7 @@ void __process_breaks(void) int __has_breaks(void) { - struct AVL *stree; + struct stree *stree; int ret; stree = pop_stree(&break_stack); @@ -824,7 +824,7 @@ int __has_breaks(void) void __merge_breaks(void) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(&break_stack); merge_stree(&cur_stree, stree); @@ -845,8 +845,8 @@ void __save_switch_states(struct expression *switch_expr) void __merge_switches(struct expression *switch_expr, struct expression *case_expr) { - struct AVL *stree; - struct AVL *implied_stree; + struct stree *stree; + struct stree *implied_stree; stree = pop_stree(&switch_stack); implied_stree = __implied_case_stree(switch_expr, case_expr, &remaining_cases, &stree); @@ -857,7 +857,7 @@ void __merge_switches(struct expression *switch_expr, struct expression *case_ex void __discard_switches(void) { - struct AVL *stree; + struct stree *stree; pop_rl(&remaining_cases); stree = pop_stree(&switch_stack); @@ -876,7 +876,7 @@ void __set_default(void) int __pop_default(void) { - struct AVL *stree; + struct stree *stree; stree = pop_stree(&default_stack); if (stree) { @@ -886,7 +886,7 @@ int __pop_default(void) return 0; } -static struct named_stree *alloc_named_stree(const char *name, struct AVL *stree) +static struct named_stree *alloc_named_stree(const char *name, struct stree *stree) { struct named_stree *named_stree = __alloc_named_stree(0); @@ -897,8 +897,8 @@ static struct named_stree *alloc_named_stree(const char *name, struct AVL *stree void __save_gotos(const char *name) { - struct AVL **stree; - struct AVL *clone; + struct stree **stree; + struct stree *clone; stree = get_named_stree(goto_stack, name); if (stree) { @@ -915,7 +915,7 @@ void __save_gotos(const char *name) void __merge_gotos(const char *name) { - struct AVL **stree; + struct stree **stree; stree = get_named_stree(goto_stack, name); if (stree) diff --git a/smatch_type_val.c b/smatch_type_val.c index b74eb230..9d6eca2b 100644 --- a/smatch_type_val.c +++ b/smatch_type_val.c @@ -39,8 +39,8 @@ static int my_id; struct stree_stack *fn_type_val_stack; -struct AVL *fn_type_val; -struct AVL *global_type_val; +struct stree *fn_type_val; +struct stree *global_type_val; static char *db_vals; static int get_vals(void *unused, int argc, char **argv, char **azColName) @@ -111,7 +111,7 @@ static struct smatch_state *clone_estate_perm(struct smatch_state *state) return ret; } -static void set_state_stree_perm(struct AVL **stree, int owner, const char *name, +static void set_state_stree_perm(struct stree **stree, int owner, const char *name, struct symbol *sym, struct smatch_state *state) { struct sm_state *sm; -- 2.11.4.GIT