From 6d576024b5b7434dc6d70127ec73f81a5114c029 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 13 Mar 2010 23:43:03 +0300 Subject: [PATCH] rename clone_state() => clone_sm() The original name was wrong and misleading. Signed-off-by: Dan Carpenter --- smatch_implied.c | 4 ++-- smatch_slist.c | 6 +++--- smatch_slist.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/smatch_implied.c b/smatch_implied.c index 99964ce3..035028f5 100644 --- a/smatch_implied.c +++ b/smatch_implied.c @@ -247,13 +247,13 @@ struct sm_state *remove_my_pools(struct sm_state *sm, } if (!left) { - ret = clone_state(right); + ret = clone_sm(right); ret->merged = 1; ret->right = right; ret->left = NULL; ret->my_pool = sm->my_pool; } else if (!right) { - ret = clone_state(left); + ret = clone_sm(left); ret->merged = 1; ret->left = left; ret->right = NULL; diff --git a/smatch_slist.c b/smatch_slist.c index 1b0a9ab2..254f3e80 100644 --- a/smatch_slist.c +++ b/smatch_slist.c @@ -213,14 +213,14 @@ void free_every_single_sm_state(void) clear_sname_alloc(); } -struct sm_state *clone_state(struct sm_state *s) +struct sm_state *clone_sm(struct sm_state *s) { struct sm_state *ret; ret = alloc_state_no_name(s->owner, s->name, s->sym, s->state); ret->merged = s->merged; ret->implied = s->implied; - /* clone_state() doesn't copy the my_pools. Each state needs to have + /* clone_sm() doesn't copy the my_pools. Each state needs to have only one my_pool. */ ret->possible = clone_slist(s->possible); ret->left = s->left; @@ -596,7 +596,7 @@ static void clone_pool_havers(struct state_list *slist) FOR_EACH_PTR(slist, state) { if (state->my_pool) { - new = clone_state(state); + new = clone_sm(state); REPLACE_CURRENT_PTR(state, new); } } END_FOR_EACH_PTR(state); diff --git a/smatch_slist.h b/smatch_slist.h index cb4c5646..473d4461 100644 --- a/smatch_slist.h +++ b/smatch_slist.h @@ -18,7 +18,7 @@ struct sm_state *alloc_sm_state(int owner, const char *name, struct smatch_state *state); void free_every_single_sm_state(void); -struct sm_state *clone_state(struct sm_state *s); +struct sm_state *clone_sm(struct sm_state *s); int is_merged(struct sm_state *sm); int is_implied(struct sm_state *sm); struct state_list *clone_slist(struct state_list *from_slist); -- 2.11.4.GIT