5 files changed, 123 insertions, 173 deletions

diff --git a/src/cflow.h b/src/cflow.h
index 7a38682..c6712c9 100644
--- a/src/cflow.h
+++ b/src/cflow.h
@@ -1,5 +1,5 @@
 /* This file is part of GNU cflow
-   Copyright (C) 1997,2005,2007 Sergey Poznyakoff
+   Copyright (C) 1997,2005,2007,2009 Sergey Poznyakoff
  
    GNU cflow is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,15 +45,19 @@
 
 #define NUMITEMS(a) sizeof(a)/sizeof((a)[0])
 
-typedef struct cons *Consptr;
-typedef struct cons Cons;
-struct cons {
-     Consptr car;
-     Consptr cdr;
+struct linked_list_entry {
+     struct linked_list_entry *next;
+     void *data;
 };
 
-#define CAR(a) (a)->car
-#define CDR(a) (a)->cdr
+typedef void (*linked_list_free_data_fp) (void*);
+
+struct linked_list {
+     linked_list_free_data_fp free_data;
+     struct linked_list_entry *head, *tail;
+};
+
+#define linked_list_head(list) ((list) ? (list)->head : NULL)
 
 enum symtype {
      SymUndefined,  /* Undefined or deleted symbol */
@@ -97,7 +101,7 @@ struct symbol {
      int token_type;               /* Type of the token */
      char *source;                 /* Source file */
      int def_line;                 /* Source line */
-     Consptr ref_line;             /* Referenced in */
+     struct linked_list *ref_line; /* Referenced in */
      
      int level;                    /* Block nesting level (for local vars),
                                       Parameter nesting level (for params) */
@@ -109,8 +113,8 @@ struct symbol {
                                       variables */  
      
      int recursive;                /* Is the function recursive */
-     Consptr caller;               /* List of callers */
-     Consptr callee;               /* List of callees */
+     struct linked_list *caller;   /* List of callers */
+     struct linked_list *callee;   /* List of callees */
 };
 
 /* Output flags */
@@ -162,10 +166,12 @@ void delete_autos(int level);
 void delete_statics(void);
 void delete_parms(int level);
 void move_parms(int level);
-void cleanup(void);
 int collect_symbols(Symbol ***, int (*sel)());
-Consptr append_to_list(Consptr *, void *);
-int symbol_in_list(Symbol *sym, Consptr list);
+struct linked_list *linked_list_create(linked_list_free_data_fp fun);
+void linked_list_destroy(struct linked_list **plist);
+void linked_list_append(struct linked_list **plist, void *data);
+void linked_list_prepend(struct linked_list **plist, void *data);
+int symbol_in_list(Symbol *sym, struct linked_list *list);
 
 int get_token(void);
 int source(char *name);
diff --git a/src/main.c b/src/main.c
index cbb472e..b08ccdd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -218,7 +218,7 @@ int preprocess_option = 0; /* Do they want to preprocess sources? */
 
 char *start_name = "main"; /* Name of start symbol */
 
-Consptr arglist;        /* List of command line arguments */
+struct linked_list *arglist;        /* List of command line arguments */
 
 /* Given the option_type array and (possibly abbreviated) option argument
  * find the type corresponding to that argument.
@@ -487,7 +487,7 @@ set_level_indent(const char *str)
 static void
 add_name(const char *name)
 {
-     append_to_list(&arglist, (void*) name);
+     linked_list_append(&arglist, (void*) name);
 }
 
 static void
@@ -769,16 +769,18 @@ main(int argc, char **argv)
 
      init();
 
-     if (arglist) 
-          /* See comment to cleanup_processor */
-          for (arglist = CAR(arglist); arglist; arglist = CDR(arglist)) {
-               char *s = (char*)CAR(arglist);
+     if (arglist) {
+          struct linked_list_entry *p;
+
+          for (p = arglist->head; p; p = p->next) {
+               char *s = (char*)p->data;
                if (s[0] == '-')
                     pp_option(s);
                else if (source(s) == 0)
                     yyparse();
           }
-
+     }
+     
      argc -= index;
      argv += index;
 
@@ -790,8 +792,6 @@ main(int argc, char **argv)
      if (input_file_count == 0)
              error(1, 0, _("no input files"));
 
-     cleanup();
-
      output();
      return 0;
 }
diff --git a/src/output.c b/src/output.c
index 7e604f4..f33d0ae 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,5 +1,5 @@
 /* This file is part of GNU cflow
-   Copyright (C) 1997,2005,2007 Sergey Poznyakoff
+   Copyright (C) 1997,2005,2007,2009 Sergey Poznyakoff
  
    GNU cflow is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -200,12 +200,13 @@ clear_active(Symbol *sym)
 
 /* Cross-reference output */
 void
-print_refs(char *name, Consptr cons)
+print_refs(char *name, struct linked_list *reflist)
 {
      Ref *refptr;
-    
-     for ( ; cons; cons = CDR(cons)) {
-          refptr = (Ref*)CAR(cons);
+     struct linked_list_entry *p;
+
+     for (p = linked_list_head(reflist); p; p = p->next) {
+          refptr = (Ref*)p->data;
           fprintf(outfile, "%s   %s:%d\n",
                   name,
                   refptr->source,
@@ -271,7 +272,7 @@ xref_output()
 static void
 scan_tree(int lev, Symbol *sym)
 {
-     Consptr cons;
+     struct linked_list_entry *p;
 
      if (sym->type == SymUndefined)
           return;
@@ -280,8 +281,8 @@ scan_tree(int lev, Symbol *sym)
           return;
      }
      sym->active = 1;
-     for (cons = sym->callee; cons; cons = CDR(cons)) {
-          scan_tree(lev+1, (Symbol*)CAR(cons));
+     for (p = linked_list_head(sym->callee); p; p = p->next) {
+          scan_tree(lev+1, (Symbol*)p->data);
      }
      sym->active = 0;
 }
@@ -293,16 +294,16 @@ set_active(Symbol *sym)
 }
 
 static int
-is_printable(Consptr cons)
+is_printable(struct linked_list_entry *p)
 {
-     return cons != NULL && include_symbol((Symbol*)CAR(cons));
+     return p != NULL && include_symbol((Symbol*)p->data);
 }
 
 static int
-is_last(Consptr cons)
+is_last(struct linked_list_entry *p)
 {
-     while (cons = CDR(cons)) 
-          if (is_printable(cons))
+     while (p = p->next) 
+          if (is_printable(p))
                return 0;
      return 1;
 }
@@ -312,7 +313,7 @@ is_last(Consptr cons)
 static void
 direct_tree(int lev, int last, Symbol *sym)
 {
-     Consptr cons;
+     struct linked_list_entry *p;
      int rc;
      
      if (sym->type == SymUndefined
@@ -325,9 +326,9 @@ direct_tree(int lev, int last, Symbol *sym)
      if (rc || sym->active)
           return;
      set_active(sym);
-     for (cons = sym->callee; cons; cons = CDR(cons)) {
+     for (p = linked_list_head(sym->callee); p; p = p->next) {