From 7d3f586f086a0e99fefca1fdec630edb52684c13 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 13 Nov 2012 09:55:42 +0300 Subject: [PATCH] sval: remove the _sval() from alloc_estate_range_sval() Signed-off-by: Dan Carpenter --- check_kernel.c | 2 +- smatch_estate.c | 2 +- smatch_extra.c | 14 +++++++------- smatch_extra.h | 2 +- smatch_function_hooks.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/check_kernel.c b/check_kernel.c index 5a167308..7d12fa61 100644 --- a/check_kernel.c +++ b/check_kernel.c @@ -78,7 +78,7 @@ static void match_err(const char *fn, struct expression *call_expr, static void match_container_of(const char *fn, struct expression *expr, void *unused) { - set_extra_expr_mod(expr->left, alloc_estate_range_sval(valid_ptr_min_sval, valid_ptr_max_sval)); + set_extra_expr_mod(expr->left, alloc_estate_range(valid_ptr_min_sval, valid_ptr_max_sval)); } void check_kernel(int id) diff --git a/smatch_estate.c b/smatch_estate.c index c1c01227..a58706fd 100644 --- a/smatch_estate.c +++ b/smatch_estate.c @@ -220,7 +220,7 @@ struct smatch_state *alloc_estate(sval_t sval) return state; } -struct smatch_state *alloc_estate_range_sval(sval_t min, sval_t max) +struct smatch_state *alloc_estate_range(sval_t min, sval_t max) { struct smatch_state *state; diff --git a/smatch_extra.c b/smatch_extra.c index 8836e44f..0d592dc3 100644 --- a/smatch_extra.c +++ b/smatch_extra.c @@ -192,13 +192,13 @@ static struct sm_state *handle_canonical_while_count_down(struct statement *loop start.value--; if (condition->type == EXPR_PREOP) { - estate = alloc_estate_range_sval(sval_type_val(start.type, 1), start); + estate = alloc_estate_range(sval_type_val(start.type, 1), start); if (!sval_is_max(start)) estate_set_hard_max(estate); set_extra_expr_mod(iter_var, estate); } if (condition->type == EXPR_POSTOP) { - estate = alloc_estate_range_sval(sval_type_val(start.type, 0), start); + estate = alloc_estate_range(sval_type_val(start.type, 0), start); if (!sval_is_max(start)) estate_set_hard_max(estate); set_extra_expr_mod(iter_var, estate); @@ -239,7 +239,7 @@ static struct sm_state *handle_canonical_for_inc(struct expression *iter_expr, } if (sval_cmp(end, start) < 0) return NULL; - estate = alloc_estate_range_sval(start, end); + estate = alloc_estate_range(start, end); if (!sval_is_max(end)) estate_set_hard_max(estate); set_extra_expr_mod(iter_var, estate); @@ -278,7 +278,7 @@ static struct sm_state *handle_canonical_for_dec(struct expression *iter_expr, } if (sval_cmp(end, start) > 0) return NULL; - estate = alloc_estate_range_sval(end, start); + estate = alloc_estate_range(end, start); estate_set_hard_max(estate); set_extra_expr_mod(iter_var, estate); return get_sm_state_expr(SMATCH_EXTRA, iter_var); @@ -518,7 +518,7 @@ static struct smatch_state *increment_state(struct smatch_state *state) min.value++; if (!sval_is_min(max) && !sval_is_max(max)) max.value++; - return alloc_estate_range_sval(min, max); + return alloc_estate_range(min, max); } static struct smatch_state *decrement_state(struct smatch_state *state) @@ -533,7 +533,7 @@ static struct smatch_state *decrement_state(struct smatch_state *state) min.value--; if (!sval_is_min(max) && !sval_is_max(max)) max.value--; - return alloc_estate_range_sval(min, max); + return alloc_estate_range(min, max); } static void unop_expr(struct expression *expr) @@ -608,7 +608,7 @@ static void match_declarations(struct symbol *sym) static void check_dereference(struct expression *expr) { - set_extra_expr_nomod(expr, alloc_estate_range_sval(valid_ptr_min_sval, valid_ptr_max_sval)); + set_extra_expr_nomod(expr, alloc_estate_range(valid_ptr_min_sval, valid_ptr_max_sval)); } static void match_dereferences(struct expression *expr) diff --git a/smatch_extra.h b/smatch_extra.h index 5efcac45..06ec2466 100644 --- a/smatch_extra.h +++ b/smatch_extra.h @@ -106,7 +106,7 @@ int false_comparison_range_lr(int comparison, struct data_range *var, struct dat struct data_range *alloc_range(sval_t min, sval_t max); void tack_on(struct range_list **list, struct data_range *drange); -struct smatch_state *alloc_estate_range_sval(sval_t min, sval_t max); +struct smatch_state *alloc_estate_range(sval_t min, sval_t max); void push_range_list(struct range_list_stack **rl_stack, struct range_list *rl); struct range_list *pop_range_list(struct range_list_stack **rl_stack); diff --git a/smatch_function_hooks.c b/smatch_function_hooks.c index 90ee41ee..94f42872 100644 --- a/smatch_function_hooks.c +++ b/smatch_function_hooks.c @@ -230,7 +230,7 @@ static int assign_ranged_funcs(const char *fn, struct expression *expr, call_ranged_call_backs(same_range_call_backs, fn, expr->right, expr); __free_ptr_list((struct ptr_list **)&same_range_call_backs); - estate = alloc_estate_range_sval(tmp->range->min, tmp->range->max); + estate = alloc_estate_range(tmp->range->min, tmp->range->max); set_extra_mod(var_name, sym, estate); tmp_slist = __pop_fake_cur_slist(); -- 2.11.4.GIT