aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
authorLinus Torvalds <torvalds@home.osdl.org>2004-02-11 15:03:26 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-07 21:01:20 -0700
commitdb4a4265c41a5da5ea06b5597a72776cc69574ab (patch)
tree2c10a2cf436cbc8c5df0ffc7979f939fc29ee58c
parent7f2bd1a27e9df408cbae57cf2aa9aa45383a7bb7 (diff)
downloadsparse-dev-db4a4265c41a5da5ea06b5597a72776cc69574ab.tar.gz
Oops. Fix name clash by renaming the new "copy_ptr_list" to be
"concat_ptr_list" (which also is more accurate). Declare linearize_symbol().
-rw-r--r--lib.c2
-rw-r--r--lib.h6
-rw-r--r--linearize.c4
-rw-r--r--linearize.h2
4 files changed, 8 insertions, 6 deletions
diff --git a/lib.c b/lib.c
index 40c512de..aca32971 100644
--- a/lib.c
+++ b/lib.c
@@ -239,7 +239,7 @@ void add_ptr_list(struct ptr_list **listp, void *ptr)
list->nr = nr;
}
-void copy_ptr_list(struct ptr_list *a, struct ptr_list **b)
+void concat_ptr_list(struct ptr_list *a, struct ptr_list **b)
{
void *entry;
FOR_EACH_PTR(a, entry) {
diff --git a/lib.h b/lib.h
index 6a6cc119..b33b87f4 100644
--- a/lib.h
+++ b/lib.h
@@ -67,7 +67,7 @@ struct ptr_list {
#define ITERATE_LAST 2
void iterate(struct ptr_list *,void (*callback)(void *, void *, int), void*);
extern void add_ptr_list(struct ptr_list **, void *);
-extern void copy_ptr_list(struct ptr_list *a, struct ptr_list **b);
+extern void concat_ptr_list(struct ptr_list *a, struct ptr_list **b);
extern void free_ptr_list(struct ptr_list **);
extern int ptr_list_size(struct ptr_list *);
extern char **handle_switch(char *arg, char **next);
@@ -85,9 +85,9 @@ extern void create_builtin_stream(void);
#define statement_list_size(list) ptr_list_size((struct ptr_list *)(list))
#define expression_list_size(list) ptr_list_size((struct ptr_list *)(list))
-static inline void copy_symbol_list(struct symbol_list *from, struct symbol_list **to)
+static inline void concat_symbol_list(struct symbol_list *from, struct symbol_list **to)
{
- copy_ptr_list((struct ptr_list *)from, (struct ptr_list **)to);
+ concat_ptr_list((struct ptr_list *)from, (struct ptr_list **)to);
}
static inline void add_symbol(struct symbol_list **list, struct symbol *sym)
diff --git a/linearize.c b/linearize.c
index ccaca661..df14e35c 100644
--- a/linearize.c
+++ b/linearize.c
@@ -74,7 +74,7 @@ static struct basic_block * linearize_statement(struct symbol_list **syms,
case STMT_COMPOUND: {
struct statement *s;
- copy_symbol_list(stmt->syms, syms);
+ concat_symbol_list(stmt->syms, syms);
FOR_EACH_PTR(stmt->stmts, s) {
bb = linearize_statement(syms, bbs, bb, s);
} END_FOR_EACH_PTR;
@@ -102,7 +102,7 @@ void linearize_symbol(struct symbol *sym)
struct basic_block *bb = alloc_basic_block();
ep->name = sym;
add_bb(&ep->bbs, bb);
- copy_symbol_list(base_type->arguments, &ep->syms);
+ concat_symbol_list(base_type->arguments, &ep->syms);
linearize_statement(&ep->syms, &ep->bbs, bb, base_type->stmt);
show_entry(ep);
}
diff --git a/linearize.h b/linearize.h
index 22761dfc..f6108dc5 100644
--- a/linearize.h
+++ b/linearize.h
@@ -23,5 +23,7 @@ struct entrypoint {
struct basic_block_list *bbs;
};
+void linearize_symbol(struct symbol *sym);
+
#endif /* LINEARIZE_H */