From c33aafd540158cdffcccac05b7b9462f4ab8f270 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 13 Jan 2010 14:43:18 +0300
Subject: [PATCH] implied cleanup:  separate do_compare into its own function

Signed-off-by: Dan Carpenter <error27@gmail.com>
---
 smatch_implied.c | 94 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/smatch_implied.c b/smatch_implied.c
index 02068be5..e7093ed0 100644
--- a/smatch_implied.c
+++ b/smatch_implied.c
@@ -106,14 +106,61 @@ static int is_checked(struct state_list *checked, struct sm_state *sm)
 }
 
 /*
+ * If 'foo' == 99 add it that pool to the true pools.  If it's false, add it to
+ * the false pools.  If we're not sure, then we don't add it to either.
+ */
+static void do_compare(struct sm_state *sm_state, int comparison, struct range_list *vals,
+			int lr,
+			struct state_list_stack **true_stack,
+			struct state_list_stack **false_stack)
+{
+	struct sm_state *s;
+	int istrue;
+	int isfalse;
+
+ 	if (!sm_state->my_pool)
+		return;
+
+	if (is_implied(sm_state)) {
+		s = get_sm_state_slist(sm_state->my_pool,
+				sm_state->owner, sm_state->name, 
+				sm_state->sym);
+	} else { 
+		s = sm_state;
+	}
+
+	istrue = !possibly_false_range_list(comparison,	get_dinfo(s->state), vals, lr);
+	isfalse = !possibly_true_range_list(comparison, get_dinfo(s->state), vals, lr);
+		
+	if (option_debug_implied || option_debug) {
+		if (istrue && isfalse) {
+			printf("'%s = %s' from %d does not exist.\n", s->name, 
+				show_state(s->state), s->line);
+		} else if (istrue) {
+			printf("'%s = %s' from %d is true.\n", s->name, show_state(s->state),
+				s->line);
+		} else if (isfalse) {
+			printf("'%s = %s' from %d is false.\n", s->name, show_state(s->state),
+				s->line);
+		} else {
+			printf("'%s = %s' from %d could be true or false.\n", s->name,
+				show_state(s->state), s->line);
+		}
+	}
+	if (istrue)
+		add_pool(true_stack, s->my_pool);
+
+	if (isfalse)
+		add_pool(false_stack, s->my_pool);
+}
+
+/*
  * separate_pools():
  * Example code:  if (foo == 99) {
  *
  * Say 'foo' is a merged state that has many possible values.  It is the combination
- * of merges.  separate_pools() iterates through the pools recursively and makes a 
- * list of pools where foo == 99 and where foo != 99.  If we don't know for sure which
- * list a pool should be added to, then we don't add it to either.
- *
+ * of merges.  separate_pools() iterates through the pools recursively and calls
+ * do_compare() for each time 'foo' was set.
  */
 static void separate_pools(struct sm_state *sm_state, int comparison, struct range_list *vals,
 			int lr,
@@ -121,8 +168,6 @@ static void separate_pools(struct sm_state *sm_state, int comparison, struct ran
 			struct state_list_stack **false_stack,
 			struct state_list **checked)
 {
-	struct sm_state *s;
-	int istrue, isfalse;
 	int free_checked = 0;
 	struct state_list *checked_states = NULL;
  
@@ -148,43 +193,8 @@ static void separate_pools(struct sm_state *sm_state, int comparison, struct ran
 		return;
 	add_ptr_list(checked, sm_state);
 	
-	if (sm_state->my_pool) {
-		if (is_implied(sm_state)) {
-			s = get_sm_state_slist(sm_state->my_pool,
-					sm_state->owner, sm_state->name, 
-					sm_state->sym);
-		} else { 
-			s = sm_state;
-		}
-
-		istrue = !possibly_false_range_list(comparison,	get_dinfo(s->state), vals, lr);
-		isfalse = !possibly_true_range_list(comparison, get_dinfo(s->state), vals, lr);
-		
-		if (option_debug_implied || option_debug) {
-			if (istrue && isfalse) {
-				printf("'%s = %s' from %d does not exist.\n",
-					s->name, show_state(s->state),
-					s->line);
-			} else if (istrue) {
-				printf("'%s = %s' from %d is true.\n",
-					s->name, show_state(s->state),
-					s->line);
-			} else if (isfalse) {
-				printf("'%s = %s' from %d is false.\n",
-					s->name, show_state(s->state),
-					s->line);
-			} else {
-				printf("'%s = %s' from %d could be true or "
-					"false.\n", s->name,
-					show_state(s->state), s->line);
-			}
-		}
-		if (istrue)
-			add_pool(true_stack, s->my_pool);
+	do_compare(sm_state, comparison, vals, lr, true_stack, false_stack);
 
-		if (isfalse)
-			add_pool(false_stack, s->my_pool);
-	}
 	separate_pools(sm_state->left, comparison, vals, lr, true_stack, false_stack, checked);
 	separate_pools(sm_state->right, comparison, vals, lr, true_stack, false_stack, checked);
 	if (free_checked)
-- 
2.11.4.GIT