From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 14 Jan 2013 20:44:16 +0000 (+0300)
Subject: ranges: rename show_ranges() to show_rl()
X-Git-Tag: 1.57~59
X-Git-Url: https://repo.or.cz/w/smatch.git/commitdiff_plain/5300aad5d70b2e6580c7139edef32d3769886055

ranges: rename show_ranges() to show_rl()

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---

diff --git a/check_bool_implications.c b/check_bool_implications.c
index 2f9d434d..6c2fe70b 100644
--- a/check_bool_implications.c
+++ b/check_bool_implications.c
@@ -91,9 +91,9 @@ static void print_implications(struct symbol *sym, int param,
 		return;
 
 	sm_msg("info: bool_return_implication \"1\" %d \"%s\" %s", param,
-	       show_ranges(estate_rl(true_state)), global_static());
+	       show_rl(estate_rl(true_state)), global_static());
 	sm_msg("info: bool_return_implication \"0\" %d \"%s\" %s", param,
-	       show_ranges(estate_rl(false_state)), global_static());
+	       show_rl(estate_rl(false_state)), global_static());
 }
 
 static void cleanup(void)
diff --git a/check_db_info.c b/check_db_info.c
index 5ff1ec67..b153a4e6 100644
--- a/check_db_info.c
+++ b/check_db_info.c
@@ -44,7 +44,7 @@ static void match_end_func(struct symbol *sym)
 	if (!return_ranges)
 		return;
 	sm_msg("info: function_return_values '%s' %s",
-	       show_ranges(return_ranges), global_static());
+	       show_rl(return_ranges), global_static());
 	return_ranges = NULL;
 }
 
diff --git a/check_debug.c b/check_debug.c
index 191e22d3..b9fde072 100644
--- a/check_debug.c
+++ b/check_debug.c
@@ -58,7 +58,7 @@ static void match_print_implied(const char *fn, struct expression *expr, void *i
 	get_implied_rl(arg, &rl);
 
 	name = expr_to_str_complex(arg);
-	sm_msg("implied: %s = '%s'", name, show_ranges(rl));
+	sm_msg("implied: %s = '%s'", name, show_rl(rl));
 	free_string(name);
 }
 
diff --git a/check_signed.c b/check_signed.c
index 4ed734e7..c94d4894 100644
--- a/check_signed.c
+++ b/check_signed.c
@@ -271,8 +271,8 @@ static void match_condition(struct expression *expr)
 		char *name = expr_to_str_complex(expr);
 
 		sm_msg("warn: impossible condition '(%s) => (%s %s %s)'", name,
-		       show_ranges(rl_left), show_special(expr->op),
-		       show_ranges(rl_right));
+		       show_rl(rl_left), show_special(expr->op),
+		       show_rl(rl_right));
 		free_string(name);
 	}
 
@@ -280,8 +280,8 @@ static void match_condition(struct expression *expr)
 		char *name = expr_to_str_complex(expr);
 
 		sm_msg("warn: always true condition '(%s) => (%s %s %s)'", name,
-		       show_ranges(rl_left_orig), show_special(expr->op),
-		       show_ranges(rl_right_orig));
+		       show_rl(rl_left_orig), show_special(expr->op),
+		       show_rl(rl_right_orig));
 		free_string(name);
 	}
 }
diff --git a/smatch_db.c b/smatch_db.c
index a85de1f4..3970ff68 100644
--- a/smatch_db.c
+++ b/smatch_db.c
@@ -582,7 +582,7 @@ static int call_return_state_hooks_split_possible(struct expression *expr)
 		overwrite_states_using_pool(tmp);
 
 		rl = cast_rl(cur_func_return_type(), estate_rl(tmp->state));
-		return_ranges = show_ranges(rl);
+		return_ranges = show_rl(rl);
 
 		return_id++;
 		slist = __get_cur_slist();
@@ -614,10 +614,10 @@ static void call_return_state_hooks(struct expression *expr)
 		return;
 	} else if (get_implied_rl(expr, &rl)) {
 		rl = cast_rl(cur_func_return_type(), rl);
-		return_ranges = show_ranges(rl);
+		return_ranges = show_rl(rl);
 	} else {
 		rl = alloc_whole_rl(cur_func_return_type());
-		return_ranges = show_ranges(rl);
+		return_ranges = show_rl(rl);
 	}
 
 	return_id++;
diff --git a/smatch_estate.c b/smatch_estate.c
index cef6dda3..37afbab4 100644
--- a/smatch_estate.c
+++ b/smatch_estate.c
@@ -239,7 +239,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(get_dinfo(state)->value_ranges);
+	state->name = show_rl(get_dinfo(state)->value_ranges);
 	estate_set_hard_max(state);
 	return state;
 }
@@ -250,7 +250,7 @@ struct smatch_state *alloc_estate_range(sval_t min, sval_t max)
 
 	state = __alloc_smatch_state(0);
 	state->data = alloc_dinfo_range(min, max);
-	state->name = show_ranges(get_dinfo(state)->value_ranges);
+	state->name = show_rl(get_dinfo(state)->value_ranges);
 	return state;
 }
 
@@ -263,7 +263,7 @@ struct smatch_state *alloc_estate_rl(struct range_list *rl)
 
 	state = __alloc_smatch_state(0);
 	state->data = alloc_dinfo_range_list(rl);
-	state->name = show_ranges(rl);
+	state->name = show_rl(rl);
 	return state;
 }
 
diff --git a/smatch_extra.c b/smatch_extra.c
index d113102d..b210c310 100644
--- a/smatch_extra.c
+++ b/smatch_extra.c
@@ -1214,7 +1214,7 @@ static void match_call_info(struct expression *expr)
 			rl = alloc_whole_rl(type);
 
 		sm_msg("info: passes param_value '%s' %d '$$' %s %s",
-		       name, i, show_ranges(rl),
+		       name, i, show_rl(rl),
 		       is_static(expr->fn) ? "static" : "global");
 		i++;
 	} END_FOR_EACH_PTR(arg);
diff --git a/smatch_extra.h b/smatch_extra.h
index d354ee73..4b95590e 100644
--- a/smatch_extra.h
+++ b/smatch_extra.h
@@ -33,7 +33,7 @@ DECLARE_ALLOCATOR(data_info);
 extern struct string_list *__ignored_macros;
 
 /* these are implemented in smatch_ranges.c */
-char *show_ranges(struct range_list *list);
+char *show_rl(struct range_list *list);
 void str_to_rl(struct symbol *type, char *value, struct range_list **rl);
 
 struct data_range *alloc_range(sval_t min, sval_t max);
diff --git a/smatch_implied.c b/smatch_implied.c
index b8973a21..6ef3a793 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(vals));
+				sm_state->name, show_special(comparison), show_rl(vals));
 		else
 			sm_msg("checking implications: (%s %s %s)",
-				show_ranges(vals), show_special(comparison), sm_state->name);
+				show_rl(vals), show_special(comparison), sm_state->name);
 	}
 
 	separate_pools(sm_state, comparison, vals, lr, &true_stack, &false_stack, NULL);
diff --git a/smatch_param_filter.c b/smatch_param_filter.c
index 6543b975..d86d0cc5 100644
--- a/smatch_param_filter.c
+++ b/smatch_param_filter.c
@@ -83,7 +83,7 @@ static char *get_orig_rl(struct sm_state *sm)
 		}
 		ret = rl_union(ret, estate_rl(extra));
 	} END_FOR_EACH_PTR(tmp);
-	return show_ranges(ret);
+	return show_rl(ret);
 }
 
 static void print_one_mod_param(int return_id, char *return_ranges,
@@ -120,7 +120,7 @@ static void print_one_extra_param(int return_id, char *return_ranges,
 
 	sm_msg("info: return_param_filter %d %d '%s' '%s' '%s' %s",
 	       return_id, param, return_ranges,
-	       param_name, show_ranges(estate_rl(sm->state)), global_static());
+	       param_name, show_rl(estate_rl(sm->state)), global_static());
 }
 
 static void print_return_value_param(int return_id, char *return_ranges, struct expression *expr, struct state_list *slist)
diff --git a/smatch_param_set.c b/smatch_param_set.c
index 21c6b86c..7bbc8d5c 100644
--- a/smatch_param_set.c
+++ b/smatch_param_set.c
@@ -83,7 +83,7 @@ static void print_return_value_param(int return_id, char *return_ranges, struct
 			continue;
 		if (!sm->sym->ident)
 			continue;
-		print_one_return_value_param(return_id, return_ranges, param, sm, show_ranges(rl), slist);
+		print_one_return_value_param(return_id, return_ranges, param, sm, show_rl(rl), slist);
 	} END_FOR_EACH_PTR(sm);
 }
 
diff --git a/smatch_ranges.c b/smatch_ranges.c
index 81495416..b035ae69 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(struct range_list *list)
+char *show_rl(struct range_list *list)
 {
 	struct data_range *tmp;
 	char full[256];