From e6e02bf58a0fe904c6fd55b8f2b78463957e3328 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 13 Nov 2012 10:10:03 +0300 Subject: [PATCH] cleanup: make type the first argument for cast_rl() I have decided I prefer this format. It matches sval_cmp_t() as well. Signed-off-by: Dan Carpenter --- check_signed.c | 8 ++++---- smatch_absolute.c | 2 +- smatch_extra.c | 22 +++++++++++----------- smatch_extra.h | 2 +- smatch_ranges.c | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/check_signed.c b/check_signed.c index 35fcd3e6..154e70a0 100644 --- a/check_signed.c +++ b/check_signed.c @@ -251,20 +251,20 @@ static void match_condition(struct expression *expr) if (get_value(expr->right, &known)) return; rl_left_orig = alloc_range_list(known, known); - rl_left = cast_rl(rl_left_orig, type); + rl_left = cast_rl(type, rl_left_orig); min = sval_type_min(get_type(expr->right)); max = sval_type_max(get_type(expr->right)); rl_right_orig = alloc_range_list(min, max); - rl_right = cast_rl(rl_right_orig, type); + rl_right = cast_rl(type, rl_right_orig); } else if (get_value(expr->right, &known)) { rl_right_orig = alloc_range_list(known, known); - rl_right = cast_rl(rl_right_orig, type); + rl_right = cast_rl(type, rl_right_orig); min = sval_type_min(get_type(expr->left)); max = sval_type_max(get_type(expr->left)); rl_left_orig = alloc_range_list(min, max); - rl_left = cast_rl(rl_left_orig, type); + rl_left = cast_rl(type, rl_left_orig); } else { return; } diff --git a/smatch_absolute.c b/smatch_absolute.c index bf8de6a5..76495259 100644 --- a/smatch_absolute.c +++ b/smatch_absolute.c @@ -91,7 +91,7 @@ static void match_assign(struct expression *expr) get_absolute_max(expr->right, &max); rl = alloc_range_list(min, max); - rl = cast_rl(rl, left_type); + rl = cast_rl(left_type, rl); min = rl_min(rl); max = rl_max(rl); diff --git a/smatch_extra.c b/smatch_extra.c index 234bac16..f1f617df 100644 --- a/smatch_extra.c +++ b/smatch_extra.c @@ -463,7 +463,7 @@ static void match_assign(struct expression *expr) switch (expr->op) { case '=': { if (get_implied_range_list(right, &rl)) { - rl = cast_rl(rl, get_type(expr->left)); + rl = cast_rl(get_type(expr->left), rl); set_extra_mod(name, sym, alloc_estate_range_list(rl)); goto free; } @@ -492,7 +492,7 @@ static void match_assign(struct expression *expr) break; } if (!sval_is_min(right_min) || !sval_is_max(right_max)) - rl = cast_rl(alloc_range_list(right_min, right_max), get_type(expr->left)); + rl = cast_rl(get_type(expr->left), alloc_range_list(right_min, right_max)); else rl = whole_range_list(get_type(expr->left)); set_extra_mod(name, sym, alloc_estate_range_list(rl)); @@ -723,19 +723,19 @@ static void match_comparison(struct expression *expr) } if (get_implied_range_list(left, &left_orig)) { - left_orig = cast_rl(left_orig, type); + left_orig = cast_rl(type, left_orig); } else { min = sval_type_min(get_type(left)); max = sval_type_max(get_type(left)); - left_orig = cast_rl(alloc_range_list(min, max), type); + left_orig = cast_rl(type, alloc_range_list(min, max)); } if (get_implied_range_list(right, &right_orig)) { - right_orig = cast_rl(right_orig, type); + right_orig = cast_rl(type, right_orig); } else { min = sval_type_min(get_type(right)); max = sval_type_max(get_type(right)); - right_orig = cast_rl(alloc_range_list(min, max), type); + right_orig = cast_rl(type, alloc_range_list(min, max)); } min = sval_type_min(type); max = sval_type_max(type); @@ -832,10 +832,10 @@ static void match_comparison(struct expression *expr) return; } - left_true_state = alloc_estate_range_list(cast_rl(left_true, get_type(left))); - left_false_state = alloc_estate_range_list(cast_rl(left_false, get_type(left))); - right_true_state = alloc_estate_range_list(cast_rl(right_true, get_type(right))); - right_false_state = alloc_estate_range_list(cast_rl(right_false, get_type(right))); + left_true_state = alloc_estate_range_list(cast_rl(get_type(left), left_true)); + left_false_state = alloc_estate_range_list(cast_rl(get_type(left), left_false)); + right_true_state = alloc_estate_range_list(cast_rl(get_type(right), right_true)); + right_false_state = alloc_estate_range_list(cast_rl(get_type(right), right_false)); switch (expr->op) { case '<': @@ -1034,7 +1034,7 @@ static void set_param_value(const char *name, struct symbol *sym, char *key, cha snprintf(fullname, 256, "%s%s", name, key + 2); parse_value_ranges_type(get_real_base_type(sym), value, &rl); - rl = cast_rl(rl, get_real_base_type(sym)); + rl = cast_rl(get_real_base_type(sym), rl); state = alloc_estate_range_list(rl); set_state(SMATCH_EXTRA, fullname, sym, state); } diff --git a/smatch_extra.h b/smatch_extra.h index ddc0e764..3fb02a45 100644 --- a/smatch_extra.h +++ b/smatch_extra.h @@ -113,7 +113,7 @@ struct range_list *pop_range_list(struct range_list_stack **rl_stack); struct range_list *top_range_list(struct range_list_stack *rl_stack); void filter_top_range_list(struct range_list_stack **rl_stack, sval_t sval); -struct range_list *cast_rl(struct range_list *rl, struct symbol *type); +struct range_list *cast_rl(struct symbol *type, struct range_list *rl); int get_implied_range_list(struct expression *expr, struct range_list **rl); int is_whole_range(struct smatch_state *state); diff --git a/smatch_ranges.c b/smatch_ranges.c index 41619637..0052672c 100644 --- a/smatch_ranges.c +++ b/smatch_ranges.c @@ -631,7 +631,7 @@ void filter_top_range_list(struct range_list_stack **rl_stack, sval_t sval) push_range_list(rl_stack, rl); } -struct range_list *cast_rl(struct range_list *rl, struct symbol *type) +struct range_list *cast_rl(struct symbol *type, struct range_list *rl) { struct data_range *tmp; struct data_range *new; -- 2.11.4.GIT