From 71c4090c2d43d9900a667ad5ee5128282b0d8644 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sun, 17 Aug 2008 21:21:39 +0300 Subject: [PATCH] Small clean up. Move the passing the whole condition into the new __split_whole_condition() function. Signed-off-by: Dan Carpenter --- smatch_conditions.c | 1 + smatch_flow.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/smatch_conditions.c b/smatch_conditions.c index d2fb8ec9..0e59f5d0 100644 --- a/smatch_conditions.c +++ b/smatch_conditions.c @@ -217,6 +217,7 @@ static void split_conditions(struct expression *expr) void __split_whole_condition(struct expression *expr) { + __pass_to_client(expr, WHOLE_CONDITION_HOOK); split_conditions(expr); SM_DEBUG("%d __ands = %d __ors = %d __negate = %d\n", get_lineno(), __ands, __ors, __negate); diff --git a/smatch_flow.c b/smatch_flow.c index 44797e47..443671aa 100644 --- a/smatch_flow.c +++ b/smatch_flow.c @@ -96,7 +96,6 @@ void __split_expr(struct expression *expr) case EXPR_CONDITIONAL: case EXPR_SELECT: __split_true_false_paths(); - __pass_to_client(expr->conditional, WHOLE_CONDITION_HOOK); __split_whole_condition(expr->conditional); __use_true_states(); __split_expr(expr->cond_true); @@ -166,7 +165,6 @@ static void handle_pre_loop(struct statement *stmt) __push_continues(); __push_breaks(); if (stmt->iterator_pre_condition) { - __pass_to_client(stmt->iterator_pre_condition, WHOLE_CONDITION_HOOK); __split_whole_condition(stmt->iterator_pre_condition); } path_orig = __split_path_id(); @@ -196,7 +194,6 @@ static void handle_post_loop(struct statement *stmt) split_statements(stmt->iterator_statement); __split_true_false_paths(); - __pass_to_client(stmt->iterator_post_condition, WHOLE_CONDITION_HOOK); __split_whole_condition(stmt->iterator_post_condition); /* It would prossibly be cleaner to make this all one function */ __use_true_states(); @@ -244,7 +241,6 @@ static void split_statements(struct statement *stmt) } case STMT_IF: __split_true_false_paths(); - __pass_to_client(stmt->if_conditional, WHOLE_CONDITION_HOOK); __split_whole_condition(stmt->if_conditional); path_orig = __split_path_id(); __use_true_states(); -- 2.11.4.GIT