From 73a454b6d96482adff2b2e67c4a08c72a17ced92 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 12 Nov 2012 22:44:12 +0300
Subject: [PATCH] sval: s/range_list_stack_sval/range_list_stack/

Rename everything back to the original names now that the transition is
over.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 smatch.h         |  4 ++--
 smatch_extra.h   | 10 +++++-----
 smatch_implied.c |  2 +-
 smatch_ranges.c  |  8 ++++----
 smatch_states.c  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/smatch.h b/smatch.h
index c474c887..a197a1b0 100644
--- a/smatch.h
+++ b/smatch.h
@@ -322,10 +322,10 @@ extern int option_no_implied;
 void get_implications(char *name, struct symbol *sym, int comparison, long long num,
 		      struct state_list **true_states,
 		      struct state_list **false_states);
-struct range_list_stack_sval;
+struct range_list_stack;
 struct state_list *__implied_case_slist(struct expression *switch_expr,
 					struct expression *case_expr,
-					struct range_list_stack_sval **remaining_cases,
+					struct range_list_stack **remaining_cases,
 					struct state_list **raw_slist);
 struct range_list *__get_implied_values(struct expression *switch_expr);
 
diff --git a/smatch_extra.h b/smatch_extra.h
index e9a553e1..8167285d 100644
--- a/smatch_extra.h
+++ b/smatch_extra.h
@@ -12,7 +12,7 @@ enum data_type {
 };
 
 DECLARE_PTR_LIST(range_list, struct data_range);
-DECLARE_PTR_LIST(range_list_stack_sval, struct range_list);
+DECLARE_PTR_LIST(range_list_stack, struct range_list);
 
 struct relation {
 	int op;
@@ -108,11 +108,11 @@ void tack_on_sval(struct range_list **list, struct data_range *drange);
 
 struct smatch_state *alloc_estate_range_sval(sval_t min, sval_t max);
 
-void push_range_list(struct range_list_stack_sval **rl_stack, struct range_list *rl);
-struct range_list *pop_range_list(struct range_list_stack_sval **rl_stack);
-struct range_list *top_range_list(struct range_list_stack_sval *rl_stack);
+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);
+struct range_list *top_range_list(struct range_list_stack *rl_stack);
 
-void filter_top_range_list(struct range_list_stack_sval **rl_stack, sval_t sval);
+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);
 int get_implied_range_list(struct expression *expr, struct range_list **rl);
 int is_whole_range(struct smatch_state *state);
diff --git a/smatch_implied.c b/smatch_implied.c
index 708d6d82..b0a6ca79 100644
--- a/smatch_implied.c
+++ b/smatch_implied.c
@@ -569,7 +569,7 @@ free:
 
 struct state_list *__implied_case_slist(struct expression *switch_expr,
 					struct expression *case_expr,
-					struct range_list_stack_sval **remaining_cases,
+					struct range_list_stack **remaining_cases,
 					struct state_list **raw_slist)
 {
 	char *name = NULL;
diff --git a/smatch_ranges.c b/smatch_ranges.c
index 96e27bf9..f94baf40 100644
--- a/smatch_ranges.c
+++ b/smatch_ranges.c
@@ -600,12 +600,12 @@ void tack_on_sval(struct range_list **list, struct data_range *drange)
 	add_ptr_list(list, drange);
 }
 
-void push_range_list(struct range_list_stack_sval **rl_stack, struct range_list *rl)
+void push_range_list(struct range_list_stack **rl_stack, struct range_list *rl)
 {
 	add_ptr_list(rl_stack, rl);
 }
 
-struct range_list *pop_range_list(struct range_list_stack_sval **rl_stack)
+struct range_list *pop_range_list(struct range_list_stack **rl_stack)
 {
 	struct range_list *rl;
 
@@ -614,7 +614,7 @@ struct range_list *pop_range_list(struct range_list_stack_sval **rl_stack)
 	return rl;
 }
 
-struct range_list *top_range_list(struct range_list_stack_sval *rl_stack)
+struct range_list *top_range_list(struct range_list_stack *rl_stack)
 {
 	struct range_list *rl;
 
@@ -622,7 +622,7 @@ struct range_list *top_range_list(struct range_list_stack_sval *rl_stack)
 	return rl;
 }
 
-void filter_top_range_list(struct range_list_stack_sval **rl_stack, sval_t sval)
+void filter_top_range_list(struct range_list_stack **rl_stack, sval_t sval)
 {
 	struct range_list *rl;
 
diff --git a/smatch_states.c b/smatch_states.c
index 776204a7..3811c28f 100644
--- a/smatch_states.c
+++ b/smatch_states.c
@@ -47,7 +47,7 @@ static struct state_list_stack *fake_cur_slist_stack;
 
 static struct state_list_stack *break_stack;
 static struct state_list_stack *switch_stack;
-static struct range_list_stack_sval *remaining_cases;
+static struct range_list_stack *remaining_cases;
 static struct state_list_stack *default_stack;
 static struct state_list_stack *continue_stack;
 
-- 
2.11.4.GIT