From cec0ce90ca9ca624346643f0c17a36e77ea85cf3 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 13 Nov 2012 09:42:13 +0300 Subject: [PATCH] sval: remove the _sval() from show_range_sval() Signed-off-by: Dan Carpenter --- check_bool_implications.c | 4 ++-- check_db_info.c | 2 +- check_debug.c | 2 +- check_param_range.c | 2 +- check_signed.c | 8 ++++---- check_user_data.c | 2 +- smatch_db.c | 2 +- smatch_estate.c | 6 +++--- smatch_extra.c | 2 +- smatch_extra.h | 2 +- smatch_implied.c | 4 ++-- smatch_parse_call_math.c | 4 ++-- smatch_ranges.c | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/check_bool_implications.c b/check_bool_implications.c index addea5e2..fca853e6 100644 --- a/check_bool_implications.c +++ b/check_bool_implications.c @@ -92,9 +92,9 @@ static void print_implications(struct symbol *sym, int param, return; sm_msg("info: bool_return_implication \"1\" %d \"%s\" %s", param, - show_ranges_sval(estate_ranges_sval(true_state)), global_static()); + show_ranges(estate_ranges_sval(true_state)), global_static()); sm_msg("info: bool_return_implication \"0\" %d \"%s\" %s", param, - show_ranges_sval(estate_ranges_sval(false_state)), global_static()); + show_ranges(estate_ranges_sval(false_state)), global_static()); } static void cleanup(void) diff --git a/check_db_info.c b/check_db_info.c index 5bb99d2b..56dc5acd 100644 --- a/check_db_info.c +++ b/check_db_info.c @@ -43,7 +43,7 @@ static void match_end_func(struct symbol *sym) if (!return_ranges) return; sm_msg("info: function_return_values '%s' %s", - show_ranges_sval(return_ranges), global_static()); + show_ranges(return_ranges), global_static()); return_ranges = NULL; } diff --git a/check_debug.c b/check_debug.c index 1c435614..aaff2365 100644 --- a/check_debug.c +++ b/check_debug.c @@ -57,7 +57,7 @@ static void match_print_implied(const char *fn, struct expression *expr, void *i get_implied_range_list(arg, &rl); name = get_variable_from_expr_complex(arg, NULL); - sm_msg("implied: %s = '%s'", name, show_ranges_sval(rl)); + sm_msg("implied: %s = '%s'", name, show_ranges(rl)); free_string(name); } diff --git a/check_param_range.c b/check_param_range.c index ddd4b11a..8c549344 100644 --- a/check_param_range.c +++ b/check_param_range.c @@ -213,7 +213,7 @@ static void match_end_func(struct symbol *sym) if (is_whole_range_rl(param_constraints[i])) continue; sm_msg("info: %s param %d range '%s' implies error return %s", - global_static(), i, show_ranges_sval(param_constraints[i]), + global_static(), i, show_ranges(param_constraints[i]), global_static()); } diff --git a/check_signed.c b/check_signed.c index 584d1441..35fcd3e6 100644 --- a/check_signed.c +++ b/check_signed.c @@ -273,8 +273,8 @@ static void match_condition(struct expression *expr) char *name = get_variable_from_expr_complex(expr, NULL); sm_msg("warn: impossible condition '(%s) => (%s %s %s)'", name, - show_ranges_sval(rl_left), show_special(expr->op), - show_ranges_sval(rl_right)); + show_ranges(rl_left), show_special(expr->op), + show_ranges(rl_right)); free_string(name); } @@ -282,8 +282,8 @@ static void match_condition(struct expression *expr) char *name = get_variable_from_expr_complex(expr, NULL); sm_msg("warn: always true condition '(%s) => (%s %s %s)'", name, - show_ranges_sval(rl_left_orig), show_special(expr->op), - show_ranges_sval(rl_right_orig)); + show_ranges(rl_left_orig), show_special(expr->op), + show_ranges(rl_right_orig)); free_string(name); } } diff --git a/check_user_data.c b/check_user_data.c index 2983cdac..b722fd55 100644 --- a/check_user_data.c +++ b/check_user_data.c @@ -322,7 +322,7 @@ static void match_return(struct expression *expr) get_implied_range_list(expr, &rl); sm_msg("info: returns_user_data %d '%s' %s", - get_return_id(), show_ranges_sval(rl), global_static()); + get_return_id(), show_ranges(rl), global_static()); } } diff --git a/smatch_db.c b/smatch_db.c index 9ed315d2..68a828f1 100644 --- a/smatch_db.c +++ b/smatch_db.c @@ -479,7 +479,7 @@ static void match_return_info(struct expression *ret_value) get_implied_range_list(ret_value, &rl); sm_msg("info: return_marker %d '%s' %s", - get_return_id(), show_ranges_sval(rl), global_static()); + get_return_id(), show_ranges(rl), global_static()); } static void match_end_func_info(struct symbol *sym) diff --git a/smatch_estate.c b/smatch_estate.c index ef6ba6d4..09f67b10 100644 --- a/smatch_estate.c +++ b/smatch_estate.c @@ -215,7 +215,7 @@ struct smatch_state *alloc_estate_sval(sval_t sval) state = __alloc_smatch_state(0); state->data = alloc_dinfo_range(sval, sval); - state->name = show_ranges_sval(get_dinfo(state)->value_ranges); + state->name = show_ranges(get_dinfo(state)->value_ranges); estate_set_hard_max(state); return state; } @@ -226,7 +226,7 @@ struct smatch_state *alloc_estate_range_sval(sval_t min, sval_t max) state = __alloc_smatch_state(0); state->data = alloc_dinfo_range(min, max); - state->name = show_ranges_sval(get_dinfo(state)->value_ranges); + state->name = show_ranges(get_dinfo(state)->value_ranges); return state; } @@ -239,7 +239,7 @@ struct smatch_state *alloc_estate_range_list(struct range_list *rl) state = __alloc_smatch_state(0); state->data = alloc_dinfo_range_list(rl); - state->name = show_ranges_sval(rl); + state->name = show_ranges(rl); return state; } diff --git a/smatch_extra.c b/smatch_extra.c index f40d345e..0c83e993 100644 --- a/smatch_extra.c +++ b/smatch_extra.c @@ -1014,7 +1014,7 @@ static void match_call_info(struct expression *expr) FOR_EACH_PTR(expr->args, arg) { if (get_implied_range_list(arg, &rl) && !is_whole_range_rl(rl)) { sm_msg("info: passes param_value '%s' %d '$$' %s %s", - name, i, show_ranges_sval(rl), + name, i, show_ranges(rl), is_static(expr->fn) ? "static" : "global"); } i++; diff --git a/smatch_extra.h b/smatch_extra.h index 4d178bde..6bcc2f6e 100644 --- a/smatch_extra.h +++ b/smatch_extra.h @@ -57,7 +57,7 @@ void free_range_list(struct range_list **rlist); void free_data_info_allocs(void); struct range_list *clone_range_list(struct range_list *list); struct range_list *clone_permanent(struct range_list *list); -char *show_ranges_sval(struct range_list *list); +char *show_ranges(struct range_list *list); void get_value_ranges_type(struct symbol *type, char *value, struct range_list **rl); void get_value_ranges_sval(char *value, struct range_list **rl); diff --git a/smatch_implied.c b/smatch_implied.c index c357b3d7..ccb86f0d 100644 --- a/smatch_implied.c +++ b/smatch_implied.c @@ -379,10 +379,10 @@ static void separate_and_filter(struct sm_state *sm_state, int comparison, struc if (option_debug_implied || option_debug) { if (lr == LEFT) sm_msg("checking implications: (%s %s %s)", - sm_state->name, show_special(comparison), show_ranges_sval(vals)); + sm_state->name, show_special(comparison), show_ranges(vals)); else sm_msg("checking implications: (%s %s %s)", - show_ranges_sval(vals), show_special(comparison), sm_state->name); + show_ranges(vals), show_special(comparison), sm_state->name); } separate_pools(sm_state, comparison, vals, lr, &true_stack, &false_stack, NULL); diff --git a/smatch_parse_call_math.c b/smatch_parse_call_math.c index 21156886..02c0993c 100644 --- a/smatch_parse_call_math.c +++ b/smatch_parse_call_math.c @@ -456,7 +456,7 @@ static void match_returns_call(struct expression *call) return; get_implied_range_list(call, &rl); sm_msg("info: return_allocation %d '%s' '%s' %s", - get_return_id(), show_ranges_sval(rl), sname, global_static()); + get_return_id(), show_ranges(rl), sname, global_static()); } static void match_return(struct expression *expr) @@ -478,7 +478,7 @@ static void match_return(struct expression *expr) return; get_implied_range_list(expr, &rl); sm_msg("info: return_allocation %d '%s' '%s' %s", - get_return_id(), show_ranges_sval(rl), state->name, global_static()); + get_return_id(), show_ranges(rl), state->name, global_static()); } void register_parse_call_math(int id) diff --git a/smatch_ranges.c b/smatch_ranges.c index 042ff9a6..b6641fbb 100644 --- a/smatch_ranges.c +++ b/smatch_ranges.c @@ -17,7 +17,7 @@ ALLOCATOR(data_range, "data range"); __DO_ALLOCATOR(struct data_range, sizeof(struct data_range), __alignof__(struct data_range), "permanent ranges", perm_data_range); -char *show_ranges_sval(struct range_list *list) +char *show_ranges(struct range_list *list) { struct data_range *tmp; char full[256]; -- 2.11.4.GIT