Corrected a number of function returns, mainly to avoid compile-

time warnings and errors.  Removed the "-lazy" option from the
Tcl load command, which is not needed when the stubs libraries
are compiled in correctly, and which causes issues on some
systems (e.g., Mac OS).  Thanks to Matt Guthaus for the patch.

base/flatten.c

@@ -1417,7 +1417,7 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
     else
 	tc2 = LookupCellFile(name2, file2);
 
-    if (tc1 == NULL || tc2 == NULL) return;
+    if (tc1 == NULL || tc2 == NULL) return 0;
 
     InitializeHashTable(&compdict, OBJHASHSIZE);
 

base/hash.c

@@ -309,7 +309,7 @@ struct hashlist *HashInt2PtrInstall(char *name, int c, void *ptr,
 /* destroy a hash table, freeing associated memory 			*/
 /*----------------------------------------------------------------------*/
 
-void *HashKill(struct hashdict *dict)
+void HashKill(struct hashdict *dict)
 {
   struct hashlist *np, *p;
   int i;

base/hash.h

@@ -25,6 +25,7 @@ extern struct nlist *RecurseHashTablePointer(struct hashdict *dict,
 	void *pointer);
 extern void HashDelete(char *name, struct hashdict *dict);
 extern void HashIntDelete(char *name, int value, struct hashdict *dict);
+extern void HashKill(struct hashdict *dict);
 
 
 extern int CountHashTableEntries(struct hashlist *p);

base/netcmp.c

@@ -573,7 +573,7 @@ struct FormattedList *FormatBadElementFragment(struct Element *E)
   elemlist = (struct FormattedList *)MALLOC(sizeof(struct FormattedList));
   if (elemlist == NULL) {
      Fprintf(stdout, "Unable to allocated memory to print element fanout.\n");
-     return;
+     return NULL;
   }
 
   fanout = 0;
@@ -582,7 +582,7 @@ struct FormattedList *FormatBadElementFragment(struct Element *E)
   if (nodes == NULL) {
     Fprintf(stderr, "Unable to allocate memory to print element fanout.\n");
     FREE(elemlist);
-    return;
+    return NULL;
   }
 
   elemlist->flist = (struct FanoutList *)CALLOC(fanout, sizeof(struct FanoutList));
@@ -829,14 +829,14 @@ struct FormattedList *FormatBadNodeFragment(struct Node *N)
   pins = (struct ElementList **)CALLOC(fanout, sizeof(struct ElementList *));
   if (pins == NULL) {
     Fprintf(stdout, "Unable to allocate memory to print node fanout.\n");
-    return;
+    return NULL;
   }
 
   nodelist = (struct FormattedList *)MALLOC(sizeof(struct FormattedList));
   if (nodelist == NULL) {
     Fprintf(stdout, "Unable to allocate memory to print node fanout.\n");
     FREE(pins);
-    return;
+    return NULL;
   }
   nodelist->flist = (struct FanoutList *)CALLOC(fanout, sizeof(struct FanoutList));
   nodelist->fanout = fanout;
@@ -6054,7 +6054,7 @@ int IgnoreClass(char *name, int file, unsigned char type)
    if ((file == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       IgnoreClass(name, Circuit1->file, type);
       IgnoreClass(name, Circuit2->file, type);
-      return;
+      return 0;
    }
 
    newIgnore = (struct IgnoreList *)MALLOC(sizeof(struct IgnoreList));

base/netgen.c

@@ -1038,7 +1038,7 @@ struct property *PropertyValue(char *name, int fnum, char *key,
    if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       PropertyValue(name, Circuit1->file, key, slop, pdefault);
       PropertyValue(name, Circuit2->file, key, slop, pdefault);
-      return;
+      return NULL;
    }
 
    tc = LookupCellFile(name, fnum);
@@ -1073,7 +1073,7 @@ struct property *PropertyDouble(char *name, int fnum, char *key,
    if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       PropertyDouble(name, Circuit1->file, key, slop, pdefault);
       PropertyDouble(name, Circuit2->file, key, slop, pdefault);
-      return;
+      return NULL;
    }
 
    tc = LookupCellFile(name, fnum);
@@ -1106,7 +1106,7 @@ struct property *PropertyInteger(char *name, int fnum, char *key,
    if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       PropertyInteger(name, Circuit1->file, key, slop, pdefault);
       PropertyInteger(name, Circuit2->file, key, slop, pdefault);
-      return;
+      return NULL;
    }
 
    tc = LookupCellFile(name, fnum);
@@ -1139,7 +1139,7 @@ struct property *PropertyString(char *name, int fnum, char *key, double dval,
    if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       PropertyString(name, Circuit1->file, key, dval, pdefault);
       PropertyString(name, Circuit2->file, key, dval, pdefault);
-      return;
+      return NULL;
    }
 
    tc = LookupCellFile(name, fnum);

base/objlist.c

@@ -348,7 +348,7 @@ int removeshorted(struct hashlist *p, int file)
 
    ptr = (struct nlist *)(p->ptr);
 
-   if ((file != -1) && (ptr->file != file)) return;
+   if ((file != -1) && (ptr->file != file)) return 0;
 
    lob = NULL;
    for (ob = ptr->cell; ob != NULL;) {
@@ -412,7 +412,7 @@ int deleteclass(struct hashlist *p, int file)
 
    ptr = (struct nlist *)(p->ptr);
 
-   if ((file != -1) && (ptr->file != file)) return;
+   if ((file != -1) && (ptr->file != file)) return 0;
 
    lob = NULL;
    for (ob = ptr->cell; ob != NULL;) {
@@ -469,7 +469,7 @@ int renameinstances(struct hashlist *p, int file)
 
    ptr = (struct nlist *)(p->ptr);
 
-   if ((file != -1) && (ptr->file != file)) return;
+   if ((file != -1) && (ptr->file != file)) return 0;
 
    for (ob = ptr->cell; ob != NULL; ob = ob->next) {
       if ((ob->type >= FIRSTPIN) && (ob->model.class != NULL)) {

base/xilinx.c

@@ -132,6 +132,7 @@ char *xilinx_class(model)
 	}
 	return(model);
 }
+void
 Xilinx(cellname, filename)
 	char *cellname;
 	char *filename;