From af0c867230657ffe70db95eee3ac551e106d6a17 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 17 Sep 2008 22:25:17 +0300 Subject: [PATCH] I want to reuse the name smatch_state. The current use is only needed internally and not in the checks. Rename everything and move the declaration from smatch.h to smatch_slist.h. Signed-off-by: Dan Carpenter --- smatch.h | 14 -------------- smatch_slist.c | 34 +++++++++++++++++----------------- smatch_slist.h | 26 ++++++++++++++++++++------ smatch_states.c | 12 ++++++------ 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/smatch.h b/smatch.h index 38124213..afa7f215 100644 --- a/smatch.h +++ b/smatch.h @@ -20,20 +20,6 @@ #define KERNEL -struct state_history { - unsigned int loc; -}; -DECLARE_PTR_LIST(history_list, struct state_history); - -struct smatch_state { - char *name; - unsigned int owner; - struct symbol *sym; - int state; - struct history_list *line_history; - struct history_list *path_history; -}; - enum hook_type { EXPR_HOOK, STMT_HOOK, diff --git a/smatch_slist.c b/smatch_slist.c index 19ee8e44..a239fbc9 100644 --- a/smatch_slist.c +++ b/smatch_slist.c @@ -12,10 +12,10 @@ #include "smatch.h" #include "smatch_slist.h" -ALLOCATOR(smatch_state, "smatch state"); +ALLOCATOR(sm_state, "smatch state"); ALLOCATOR(named_slist, "named slist"); -void add_history(struct smatch_state *state) +void add_history(struct sm_state *state) { struct state_history *tmp; @@ -26,10 +26,10 @@ void add_history(struct smatch_state *state) add_ptr_list(&state->line_history, tmp); } -struct smatch_state *alloc_state(const char *name, int owner, +struct sm_state *alloc_state(const char *name, int owner, struct symbol *sym, int state) { - struct smatch_state *sm_state = __alloc_smatch_state(0); + struct sm_state *sm_state = __alloc_sm_state(0); sm_state->name = (char *)name; sm_state->owner = owner; @@ -41,15 +41,15 @@ struct smatch_state *alloc_state(const char *name, int owner, return sm_state; } -struct smatch_state *clone_state(struct smatch_state *s) +struct sm_state *clone_state(struct sm_state *s) { return alloc_state(s->name, s->owner, s->sym, s->state); } struct state_list *clone_slist(struct state_list *from_slist) { - struct smatch_state *state; - struct smatch_state *tmp; + struct sm_state *state; + struct sm_state *tmp; struct state_list *to_slist = NULL; FOR_EACH_PTR(from_slist, state) { @@ -82,7 +82,7 @@ int merge_states(const char *name, int owner, struct symbol *sym, void merge_state_slist(struct state_list **slist, const char *name, int owner, struct symbol *sym, int state) { - struct smatch_state *tmp; + struct sm_state *tmp; int s; FOR_EACH_PTR(*slist, tmp) { @@ -103,7 +103,7 @@ void merge_state_slist(struct state_list **slist, const char *name, int owner, int get_state_slist(struct state_list *slist, const char *name, int owner, struct symbol *sym) { - struct smatch_state *state; + struct sm_state *state; if (!name) return NOTFOUND; @@ -116,7 +116,7 @@ int get_state_slist(struct state_list *slist, const char *name, int owner, return NOTFOUND; } -void add_state_slist(struct state_list **slist, struct smatch_state *state) +void add_state_slist(struct state_list **slist, struct sm_state *state) { add_ptr_list(slist, state); } @@ -124,7 +124,7 @@ void add_state_slist(struct state_list **slist, struct smatch_state *state) void set_state_slist(struct state_list **slist, const char *name, int owner, struct symbol *sym, int state) { - struct smatch_state *tmp; + struct sm_state *tmp; FOR_EACH_PTR(*slist, tmp) { if (tmp->owner == owner && tmp->sym == sym @@ -140,14 +140,14 @@ void set_state_slist(struct state_list **slist, const char *name, int owner, void delete_state_slist(struct state_list **slist, const char *name, int owner, struct symbol *sym) { - struct smatch_state *state; + struct sm_state *state; FOR_EACH_PTR(*slist, state) { if (state->owner == owner && state->sym == sym && !strcmp(state->name, name)){ delete_ptr_list_entry((struct ptr_list **)slist, state, 1); - __free_smatch_state(state); + __free_sm_state(state); return; } } END_FOR_EACH_PTR(state); @@ -223,7 +223,7 @@ void merge_state_stack(struct state_list_stack **stack, const char *name, void merge_slist(struct state_list *slist) { - struct smatch_state *state; + struct sm_state *state; if (!slist) { return; @@ -250,7 +250,7 @@ void merge_slist(struct state_list *slist) void and_slist_stack(struct state_list_stack **slist_stack, struct state_list *tmp_slist) { - struct smatch_state *tmp; + struct sm_state *tmp; int tmp_state; FOR_EACH_PTR(tmp_slist, tmp) { @@ -276,7 +276,7 @@ void or_slist_stack(struct state_list_stack **slist_stack) struct state_list *one; struct state_list *two; struct state_list *res = NULL; - struct smatch_state *tmp; + struct sm_state *tmp; int s; one = pop_slist(slist_stack); @@ -309,7 +309,7 @@ struct state_list *get_slist_from_slist_stack(struct slist_stack *stack, void overwrite_slist(struct state_list *from, struct state_list **to) { - struct smatch_state *tmp; + struct sm_state *tmp; FOR_EACH_PTR(from, tmp) { set_state_slist(to, tmp->name, tmp->owner, tmp->sym, tmp->state); diff --git a/smatch_slist.h b/smatch_slist.h index 3e3ef4f2..87a805f9 100644 --- a/smatch_slist.h +++ b/smatch_slist.h @@ -1,5 +1,19 @@ -DECLARE_ALLOCATOR(smatch_state); -DECLARE_PTR_LIST(state_list, struct smatch_state); +struct state_history { + unsigned int loc; +}; +DECLARE_PTR_LIST(history_list, struct state_history); + +struct sm_state { + char *name; + unsigned int owner; + struct symbol *sym; + int state; + struct history_list *line_history; + struct history_list *path_history; +}; + +DECLARE_ALLOCATOR(sm_state); +DECLARE_PTR_LIST(state_list, struct sm_state); DECLARE_PTR_LIST(state_list_stack, struct state_list); struct named_slist { char *name; @@ -10,11 +24,11 @@ DECLARE_PTR_LIST(slist_stack, struct named_slist); extern struct state_list *cur_slist; /* current states */ -void add_history(struct smatch_state *state); -struct smatch_state *alloc_state(const char *name, int owner, +void add_history(struct sm_state *state); +struct sm_state *alloc_state(const char *name, int owner, struct symbol *sym, int state); -struct smatch_state *clone_state(struct smatch_state *s); +struct sm_state *clone_state(struct sm_state *s); struct state_list *clone_slist(struct state_list *from_slist); int merge_states(const char *name, int owner, struct symbol *sym, @@ -25,7 +39,7 @@ void merge_state_slist(struct state_list **slist, const char *name, int owner, int get_state_slist(struct state_list *slist, const char *name, int owner, struct symbol *sym); -void add_state_slist(struct state_list **slist, struct smatch_state *state); +void add_state_slist(struct state_list **slist, struct sm_state *state); void set_state_slist(struct state_list **slist, const char *name, int owner, struct symbol *sym, int state); diff --git a/smatch_states.c b/smatch_states.c index b2f08209..87332ffe 100644 --- a/smatch_states.c +++ b/smatch_states.c @@ -33,7 +33,7 @@ int debug_states; void __print_slist(struct state_list *slist) { - struct smatch_state *state; + struct sm_state *state; printf("dumping slist at %d\n", get_lineno()); FOR_EACH_PTR(slist, state) { @@ -84,7 +84,7 @@ void delete_state(const char *name, int owner, struct symbol *sym) struct state_list *get_current_states(int owner) { struct state_list *slist; - struct smatch_state *tmp; + struct sm_state *tmp; FOR_EACH_PTR(cur_slist, tmp) { if (tmp->owner == owner) { @@ -330,7 +330,7 @@ void __pop_continues() void __process_continues() { - struct smatch_state *state; + struct sm_state *state; set_state_stack(&continue_stack, "__smatch_continue_used", 1, NULL, 0); FOR_EACH_PTR(cur_slist, state) { @@ -360,7 +360,7 @@ void __push_breaks() void __process_breaks() { - struct smatch_state *state; + struct sm_state *state; set_state_stack(&break_stack, "__smatch_break_used", 0, NULL, 1); FOR_EACH_PTR(cur_slist, state) { @@ -443,7 +443,7 @@ void __set_default() int __pop_default() { struct state_list *slist; - struct smatch_state *state; + struct sm_state *state; int ret = -1; slist = pop_slist(&default_stack); @@ -471,7 +471,7 @@ void __save_gotos(const char *name) slist = get_slist_from_slist_stack(goto_stack, name); if (slist) { - struct smatch_state *state; + struct sm_state *state; FOR_EACH_PTR(cur_slist, state) { merge_state_slist(&slist, state->name, state->owner, -- 2.11.4.GIT