Nothing ever checks ReturnStatus on Lst_Insert, Lst_Append, Lst_AtFront,

Lst_AtEnd, Lst_Concat, Lst_Remove, Lst_Replace.

Don't bother returning one.

21 files changed, 173 insertions, 218 deletions

diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 428e7f0e0fc..e73c81d392f 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arch.c,v 1.21 1999/12/18 21:56:07 espie Exp $	*/
+/*	$OpenBSD: arch.c,v 1.22 1999/12/18 21:58:07 espie Exp $	*/
 /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
 #else
-static char rcsid[] = "$OpenBSD: arch.c,v 1.21 1999/12/18 21:56:07 espie Exp $";
+static char rcsid[] = "$OpenBSD: arch.c,v 1.22 1999/12/18 21:58:07 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -344,7 +344,7 @@ Arch_ParseArchive (linePtr, nodeLst, ctxt)
 		    return(FAILURE);
 		} else {
 		    gn->type |= OP_ARCHV;
-		    (void)Lst_AtEnd(nodeLst, (ClientData)gn);
+		    Lst_AtEnd(nodeLst, (ClientData)gn);
 		}
 	    } else if (Arch_ParseArchive(&sacrifice, nodeLst, ctxt)!=SUCCESS) {
 		/*
@@ -379,7 +379,7 @@ Arch_ParseArchive (linePtr, nodeLst, ctxt)
 		     * end of the provided list.
 		     */
 		    gn->type |= OP_ARCHV;
-		    (void) Lst_AtEnd (nodeLst, (ClientData)gn);
+		    Lst_AtEnd(nodeLst, (ClientData)gn);
 		}
 	    }
 	    Lst_Destroy(members, NOFREE);
@@ -397,7 +397,7 @@ Arch_ParseArchive (linePtr, nodeLst, ctxt)
 		 * provided list.
 		 */
 		gn->type |= OP_ARCHV;
-		(void) Lst_AtEnd (nodeLst, (ClientData)gn);
+		Lst_AtEnd(nodeLst, (ClientData)gn);
 	    }
 	}
 	if (doSubst) {
@@ -644,7 +644,7 @@ ArchStatMember (archive, member, hash)
 
     fclose (arch);
 
-    (void) Lst_AtEnd (archives, (ClientData) ar);
+    Lst_AtEnd(archives, (ClientData)ar);
 
     /*
      * Now that the archive has been read and cached, we can look into
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 9f7fc77119b..9fa192e3bb4 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compat.c,v 1.19 1999/12/18 21:56:07 espie Exp $	*/
+/*	$OpenBSD: compat.c,v 1.20 1999/12/18 21:58:07 espie Exp $	*/
 /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: compat.c,v 1.19 1999/12/18 21:56:07 espie Exp $";
+static char rcsid[] = "$OpenBSD: compat.c,v 1.20 1999/12/18 21:58:07 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -253,7 +253,7 @@ CompatRunCommand (cmdp, gnp)
     Lst_Replace (cmdNode, (ClientData)cmdStart);
 
     if ((gn->type & OP_SAVE_CMDS) && (gn != ENDNode)) {
-	(void)Lst_AtEnd(ENDNode->commands, (ClientData)cmdStart);
+	Lst_AtEnd(ENDNode->commands, (ClientData)cmdStart);
 	return(0);
     } else if (strcmp(cmdStart, "...") == 0) {
 	gn->type |= OP_SAVE_CMDS;
@@ -364,7 +364,7 @@ CompatRunCommand (cmdp, gnp)
 	free(bp);
     }
     free(cmdStart);
-    Lst_Replace (cmdNode, (ClientData) NULL);
+    Lst_Replace(cmdNode, (ClientData)NULL);
 
     /*
      * The child is off and running. Now all we can do is wait...
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 3e2b5812338..8368464d31a 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.12 1999/12/18 21:56:07 espie Exp $	*/
+/*	$OpenBSD: dir.c,v 1.13 1999/12/18 21:58:07 espie Exp $	*/
 /*	$NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)dir.c	8.2 (Berkeley) 1/2/94";
 #else
-static char rcsid[] = "$OpenBSD: dir.c,v 1.12 1999/12/18 21:56:07 espie Exp $";
+static char rcsid[] = "$OpenBSD: dir.c,v 1.13 1999/12/18 21:58:07 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -377,7 +377,7 @@ DirMatchFiles (pattern, p, expansions)
 	    ((entry->name[0] != '.') ||
 	     (pattern[0] == '.')))
 	{
-	    (void)Lst_AtEnd(expansions,
+	    Lst_AtEnd(expansions,
 			    (isDot ? estrdup(entry->name) :
 			     str_concat(p->name, entry->name,
 					STR_ADDSLASH)));
@@ -488,7 +488,7 @@ DirExpandCurly(word, brace, path, expansions)
 	     * Hit the end w/o finding any wildcards, so stick the expansion
 	     * on the end of the list.
 	     */
-	    (void)Lst_AtEnd(expansions, file);
+	    Lst_AtEnd(expansions, file);
 	} else {
 	next:
 	    free(file);
@@ -1067,7 +1067,7 @@ Dir_AddDir (path, name)
 	p = (Path *)Lst_Datum (ln);
 	if (Lst_Member(path, (ClientData)p) == NULL) {
 	    p->refCount += 1;
-	    (void)Lst_AtEnd (path, (ClientData)p);
+	    Lst_AtEnd(path, (ClientData)p);
 	}
     } else {
 	if (DEBUG(DIR)) {
@@ -1102,8 +1102,8 @@ Dir_AddDir (path, name)
 		(void)Hash_CreateEntry(&p->files, dp->d_name, (Boolean *)NULL);
 	    }
 	    (void) closedir (d);
-	    (void)Lst_AtEnd (openDirectories, (ClientData)p);
-	    (void)Lst_AtEnd (path, (ClientData)p);
+	    Lst_AtEnd(openDirectories, (ClientData)p);
+	    Lst_AtEnd(path, (ClientData)p);
 	}
 	if (DEBUG(DIR)) {
 	    printf("done\n");
@@ -1201,7 +1201,7 @@ Dir_Destroy (pp)
 	LstNode	ln;
 
 	ln = Lst_Member (openDirectories, (ClientData)p);
-	(void) Lst_Remove (openDirectories, ln);
+	Lst_Remove(openDirectories, ln);
 
 	Hash_DeleteTable (&p->files);
 	free((Address)p->name);
@@ -1259,7 +1259,7 @@ Dir_Concat(path1, path2)
 	p = (Path *)Lst_Datum(ln);
 	if (Lst_Member(path1, (ClientData)p) == NULL) {
 	    p->refCount += 1;
-	    (void)Lst_AtEnd(path1, (ClientData)p);
+	    Lst_AtEnd(path1, (ClientData)p);
 	}
     }
 }
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 5a2d118fadb..7c8c50cef38 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: job.c,v 1.19 1999/12/18 21:56:07 espie Exp $	*/
+/*	$OpenBSD: job.c,v 1.20 1999/12/18 21:58:07 espie Exp $	*/
 /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: job.c,v 1.19 1999/12/18 21:56:07 espie Exp $";
+static char rcsid[] = "$OpenBSD: job.c,v 1.20 1999/12/18 21:58:07 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -679,7 +679,7 @@ JobSaveCommand(cmd, gn)
     ClientData   gn;
 {
     cmd = (ClientData) Var_Subst((char *) cmd, (GNode *) gn, FALSE);
-    (void) Lst_AtEnd(postCommands->commands, cmd);
+    Lst_AtEnd(postCommands->commands, cmd);
     return(0);
 }
 
@@ -856,7 +856,7 @@ JobFinish(job, status)
 		    WSTOPSIG(*status));
 	    }
 	    job->flags |= JOB_RESUME;
-	    (void)Lst_AtEnd(stoppedJobs, (ClientData)job);
+	    Lst_AtEnd(stoppedJobs, (ClientData)job);
 #ifdef REMOTE
 	    if (job->flags & JOB_REMIGRATE)
 		JobRestart(job);
@@ -1339,7 +1339,7 @@ jobExecFinish:
      * Now the job is actually running, add it to the table.
      */
     nJobs += 1;
-    (void) Lst_AtEnd(jobs, (ClientData)job);
+    Lst_AtEnd(jobs, (ClientData)job);
     if (nJobs == maxJobs) {
 	jobFull = TRUE;
     }
@@ -1474,7 +1474,7 @@ JobRestart(job)
 		   (void) fprintf(stdout, "*** holding\n");
 		   (void) fflush(stdout);
   		}
-		(void)Lst_AtFront(stoppedJobs, (ClientData)job);
+		Lst_AtFront(stoppedJobs, (ClientData)job);
 		jobFull = TRUE;
 		if (DEBUG(JOB)) {
 		   (void) fprintf(stdout, "Job queue is full.\n");
@@ -1495,7 +1495,7 @@ JobRestart(job)
 	}
 #endif
 
-	(void)Lst_AtEnd(jobs, (ClientData)job);
+	Lst_AtEnd(jobs, (ClientData)job);
 	nJobs += 1;
 	if (nJobs == maxJobs) {
 	    jobFull = TRUE;
@@ -1540,7 +1540,7 @@ JobRestart(job)
 		    (void) fprintf(stdout, "holding\n");
 		    (void) fflush(stdout);
 		}
-		(void)Lst_AtFront(stoppedJobs, (ClientData)job);
+		Lst_AtFront(stoppedJobs, (ClientData)job);
 		jobFull = TRUE;
 		if (DEBUG(JOB)) {
 		    (void) fprintf(stdout, "Job queue is full.\n");
@@ -1640,7 +1640,7 @@ JobRestart(job)
 		(void) fprintf(stdout, "table full\n");
 		(void) fflush(stdout);
 	    }
-	    (void) Lst_AtFront(stoppedJobs, (ClientData)job);
+	    Lst_AtFront(stoppedJobs, (ClientData)job);
 	    jobFull = TRUE;
 	    if (DEBUG(JOB)) {
 		(void) fprintf(stdout, "Job queue is full.\n");
@@ -1941,7 +1941,7 @@ JobStart(gn, flags, previous)
 	   (void) fflush(stdout);
 	}
 	job->flags |= JOB_RESTART;
-	(void) Lst_AtEnd(stoppedJobs, (ClientData)job);
+	Lst_AtEnd(stoppedJobs, (ClientData)job);
     } else {
 	if ((nLocal >= maxLocal) && local) {
 	    /*
@@ -2270,7 +2270,7 @@ Job_CatchChildren(block)
 	    }
 	} else {
 	    job = (Job *) Lst_Datum(jnode);
-	    (void) Lst_Remove(jobs, jnode);
+	    Lst_Remove(jobs, jnode);
 	    nJobs -= 1;
 	    if (jobFull && DEBUG(JOB)) {
 		(void) fprintf(stdout, "Job queue is no longer full.\n");
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 5358338dc0c..885adaeb572 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lst.h,v 1.9 1999/12/18 21:53:32 espie Exp $	*/
+/*	$OpenBSD: lst.h,v 1.10 1999/12/18 21:58:07 espie Exp $	*/
 /*	$NetBSD: lst.h,v 1.7 1996/11/06 17:59:12 christos Exp $	*/
 
 /*
@@ -88,19 +88,19 @@ Boolean		Lst_IsEmpty __P((Lst));
  * Functions to modify a list
  */
 /* Insert an element before another */
-ReturnStatus	Lst_Insert __P((Lst, LstNode, ClientData));
+void		Lst_Insert __P((Lst, LstNode, ClientData));
 /* Insert an element after another */
-ReturnStatus	Lst_Append __P((Lst, LstNode, ClientData));
+void		Lst_Append __P((Lst, LstNode, ClientData));
 /* Place an element at the front of a lst. */
-ReturnStatus	Lst_AtFront __P((Lst, ClientData));
+void		Lst_AtFront __P((Lst, ClientData));
 /* Place an element at the end of a lst. */
-ReturnStatus	Lst_AtEnd __P((Lst, ClientData));
+void		Lst_AtEnd __P((Lst, ClientData));
 /* Remove an element */
-ReturnStatus	Lst_Remove __P((Lst, LstNode));
+void		Lst_Remove __P((Lst, LstNode));
 /* Replace a node with a new value */
-ReturnStatus	Lst_Replace __P((LstNode, ClientData));
+void		Lst_Replace __P((LstNode, ClientData));
 /* Concatenate two lists */
-ReturnStatus	Lst_Concat __P((Lst, Lst, int));
+void		Lst_Concat __P((Lst, Lst, int));
 
 /*
  * Node-specific functions
@@ -157,7 +157,7 @@ void		Lst_Close __P((Lst));
  * for using the list as a queue
  */
 /* Place an element at tail of queue */
-ReturnStatus	Lst_EnQueue __P((Lst, ClientData));
+void		Lst_EnQueue __P((Lst, ClientData));
 /* Remove an element from head of queue */
 ClientData	Lst_DeQueue __P((Lst));
 
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index d96fac8dba7..19e57967dfc 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstAppend.c,v 1.6 1999/12/18 21:53:33 espie Exp $	*/
+/*	$OpenBSD: lstAppend.c,v 1.7 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstAppend.c,v 1.5 1996/11/06 17:59:31 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstAppend.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstAppend.c,v 1.6 1999/12/18 21:53:33 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstAppend.c,v 1.7 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,8 +68,8 @@ static char rcsid[] = "$OpenBSD: lstAppend.c,v 1.6 1999/12/18 21:53:33 espie Exp
  *
  *-----------------------------------------------------------------------
  */
-ReturnStatus
-Lst_Append (l, ln, d)
+void
+Lst_Append(l, ln, d)
     Lst	  	l;	/* affected list */
     LstNode	ln;	/* node after which to append the datum */
     ClientData	d;	/* said datum */
@@ -83,7 +83,7 @@ Lst_Append (l, ln, d)
     }
 
     if (!LstValid (l) || LstIsEmpty (l)  || ! LstNodeValid (ln, l)) {
-	return (FAILURE);
+	return;
     }
     ok:
 
@@ -110,7 +110,5 @@ Lst_Append (l, ln, d)
 	    list->lastPtr = nLNode;
 	}
     }
-
-    return (SUCCESS);
 }
 
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index b726d6097ce..b23f781ada2 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstAtEnd.c,v 1.4 1998/12/05 00:06:31 espie Exp $	*/
+/*	$OpenBSD: lstAtEnd.c,v 1.5 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstAtEnd.c,v 1.5 1996/11/06 17:59:32 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstAtEnd.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstAtEnd.c,v 1.4 1998/12/05 00:06:31 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstAtEnd.c,v 1.5 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -57,21 +57,15 @@ static char rcsid[] = "$OpenBSD: lstAtEnd.c,v 1.4 1998/12/05 00:06:31 espie Exp
  * Lst_AtEnd --
  *	Add a node to the end of the given list
  *
- * Results:
- *	SUCCESS if life is good.
- *
  * Side Effects:
  *	A new ListNode is created and added to the list.
  *
  *-----------------------------------------------------------------------
  */
-ReturnStatus
-Lst_AtEnd (l, d)
+void
+Lst_AtEnd(l, d)
     Lst		l;	/* List to which to add the datum */
     ClientData	d;	/* Datum to add */
 {
-    register LstNode	end;
-
-    end = Lst_Last (l);
-    return (Lst_Append (l, end, d));
+    Lst_Append(l, Lst_Last(l), d);
 }
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index af79fd7332b..16fb97150e3 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstAtFront.c,v 1.4 1998/12/05 00:06:31 espie Exp $	*/
+/*	$OpenBSD: lstAtFront.c,v 1.5 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstAtFront.c,v 1.5 1996/11/06 17:59:33 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstAtFront.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstAtFront.c,v 1.4 1998/12/05 00:06:31 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstAtFront.c,v 1.5 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -57,22 +57,16 @@ static char rcsid[] = "$OpenBSD: lstAtFront.c,v 1.4 1998/12/05 00:06:31 espie Ex
  * Lst_AtFront --
  *	Place a piece of data at the front of a list
  *
- * Results:
- *	SUCCESS or FAILURE
- *
  * Side Effects:
  *	A new ListNode is created and stuck at the front of the list.
  *	hence, firstPtr (and possible lastPtr) in the list are altered.
  *
  *-----------------------------------------------------------------------
  */
-ReturnStatus
+void
 Lst_AtFront (l, d)
     Lst		l;
     ClientData	d;
 {
-    register LstNode	front;
-
-    front = Lst_First (l);
-    return (Lst_Insert (l, front, d));
+    Lst_Insert(l, Lst_First(l), d);
 }
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index 88270d845df..265e0a9c6c0 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstConcat.c,v 1.6 1999/12/18 21:53:33 espie Exp $	*/
+/*	$OpenBSD: lstConcat.c,v 1.7 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstConcat.c,v 1.6 1996/11/06 17:59:34 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstConcat.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstConcat.c,v 1.6 1999/12/18 21:53:33 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstConcat.c,v 1.7 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -69,7 +69,7 @@ static char rcsid[] = "$OpenBSD: lstConcat.c,v 1.6 1999/12/18 21:53:33 espie Exp
  *	New elements are created and appended the the first list.
  *-----------------------------------------------------------------------
  */
-ReturnStatus
+void
 Lst_Concat (l1, l2, flags)
     Lst    	  	l1; 	/* The list to which l2 is to be appended */
     Lst    	  	l2; 	/* The list to append to l1 */
@@ -84,7 +84,7 @@ Lst_Concat (l1, l2, flags)
     register List 	list2 = (List)l2;
 
     if (!LstValid (l1) || !LstValid (l2)) {
-	return (FAILURE);
+	return;
     }
 
     if (flags == LST_CONCLINK) {
@@ -155,7 +155,5 @@ Lst_Concat (l1, l2, flags)
 
 	list2->lastPtr->nextPtr = list2->firstPtr;
     }
-
-    return (SUCCESS);
 }
 
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index 89495585268..ee8a12bbf2c 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstDeQueue.c,v 1.5 1999/12/18 21:53:33 espie Exp $	*/
+/*	$OpenBSD: lstDeQueue.c,v 1.6 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstDeQueue.c,v 1.5 1996/11/06 17:59:36 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstDeQueue.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstDeQueue.c,v 1.5 1999/12/18 21:53:33 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstDeQueue.c,v 1.6 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -67,22 +67,18 @@ static char rcsid[] = "$OpenBSD: lstDeQueue.c,v 1.5 1999/12/18 21:53:33 espie Ex
  *-----------------------------------------------------------------------
  */
 ClientData
-Lst_DeQueue (l)
-    Lst	    	  l;
+Lst_DeQueue(l)
+    Lst	    	  	l;
 {
-    ClientData	  rd;
-    register ListNode	tln;
+    ClientData	 	rd;
+    LstNode		tln;
 
-    tln = (ListNode) Lst_First (l);
-    if (tln == NULL) {
-	return ((ClientData) NULL);
-    }
+    tln = Lst_First(l);
+    if (tln == NULL)
+	return (ClientData)NULL;
 
-    rd = tln->datum;
-    if (Lst_Remove (l, (LstNode)tln) == FAILURE) {
-	return ((ClientData) NULL);
-    } else {
-	return (rd);
-    }
+    rd = ((ListNode)tln)->datum;
+    Lst_Remove(l, tln);
+    return rd;
 }
 
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index e21b71148c8..69c53b3d5a6 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstDupl.c,v 1.6 1999/12/18 21:53:33 espie Exp $	*/
+/*	$OpenBSD: lstDupl.c,v 1.7 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstDupl.c,v 1.6 1996/11/06 17:59:37 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstDupl.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstDupl.c,v 1.6 1999/12/18 21:53:33 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstDupl.c,v 1.7 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -85,17 +85,11 @@ Lst_Duplicate (l, copyProc)
 	return (NULL);
     }
 
-    ln = list->firstPtr;
-    while (ln != NULL) {
-	if (copyProc != NOCOPY) {
-	    if (Lst_AtEnd (nl, (*copyProc) (ln->datum)) == FAILURE) {
-		return (NULL);
-	    }
-	} else if (Lst_AtEnd (nl, ln->datum) == FAILURE) {
-	    return (NULL);
-	}
-
-	ln = ln->nextPtr;
+    for (ln = list->firstPtr; ln != NULL; ln = ln->nextPtr) {
+    	if (copyProc != NOCOPY)
+	    Lst_AtEnd(nl, (*copyProc)(ln->datum));
+	else
+	    Lst_AtEnd(nl, ln->datum);
     }
 
     return (nl);
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index cabe4330941..2fa56654e00 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstEnQueue.c,v 1.4 1998/12/05 00:06:31 espie Exp $	*/
+/*	$OpenBSD: lstEnQueue.c,v 1.5 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstEnQueue.c,v 1.5 1996/11/06 17:59:38 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstEnQueue.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstEnQueue.c,v 1.4 1998/12/05 00:06:31 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstEnQueue.c,v 1.5 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -57,24 +57,20 @@ static char rcsid[] = "$OpenBSD: lstEnQueue.c,v 1.4 1998/12/05 00:06:31 espie Ex
  * Lst_EnQueue --
  *	Add the datum to the tail of the given list.
  *
- * Results:
- *	SUCCESS or FAILURE as returned by Lst_Append.
- *
  * Side Effects:
  *	the lastPtr field is altered all the time and the firstPtr field
  *	will be altered if the list used to be empty.
  *
  *-----------------------------------------------------------------------
  */
-ReturnStatus
-Lst_EnQueue (l, d)
+void
+Lst_EnQueue(l, d)
     Lst	    	  l;
     ClientData	  d;
 {
-    if (LstValid (l) == FALSE) {
-	return (FAILURE);
-    }
+    if (LstValid(l) == FALSE) 
+	return;
 
-    return (Lst_Append (l, Lst_Last(l), d));
+    Lst_AtEnd(l, d);
 }
 
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index d81be7e2b18..92d3f0c12ab 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstInsert.c,v 1.6 1999/12/18 21:53:33 espie Exp $	*/
+/*	$OpenBSD: lstInsert.c,v 1.7 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstInsert.c,v 1.5 1996/11/06 17:59:44 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstInsert.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstInsert.c,v 1.6 1999/12/18 21:53:33 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstInsert.c,v 1.7 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -58,16 +58,13 @@ static char rcsid[] = "$OpenBSD: lstInsert.c,v 1.6 1999/12/18 21:53:33 espie Exp
  *	Insert a new node with the given piece of data before the given
  *	node in the given list.
  *
- * Results:
- *	SUCCESS or FAILURE.
- *
  * Side Effects:
  *	the firstPtr field will be changed if ln is the first node in the
  *	list.
  *
  *-----------------------------------------------------------------------
  */
-ReturnStatus
+void
 Lst_Insert (l, ln, d)
     Lst	    	  	l;	/* list to manipulate */
     LstNode	  	ln;	/* node before which to insert d */
@@ -85,7 +82,7 @@ Lst_Insert (l, ln, d)
 	goto ok;
 
     if (!LstValid (l) || LstIsEmpty (l) || !LstNodeValid (ln, l)) {
-	return (FAILURE);
+	return;
     }
 
     ok:
@@ -110,7 +107,5 @@ Lst_Insert (l, ln, d)
 	    list->firstPtr = nLNode;
 	}
     }
-
-    return (SUCCESS);
 }
 
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index b44c09334ea..e2a9075cc8f 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstRemove.c,v 1.5 1999/12/18 21:53:34 espie Exp $	*/
+/*	$OpenBSD: lstRemove.c,v 1.6 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstRemove.c,v 1.5 1996/11/06 17:59:50 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstRemove.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstRemove.c,v 1.5 1999/12/18 21:53:34 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstRemove.c,v 1.6 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -67,8 +67,8 @@ static char rcsid[] = "$OpenBSD: lstRemove.c,v 1.5 1999/12/18 21:53:34 espie Exp
  *
  *-----------------------------------------------------------------------
  */
-ReturnStatus
-Lst_Remove (l, ln)
+void
+Lst_Remove(l, ln)
     Lst	    	  	l;
     LstNode	  	ln;
 {
@@ -77,7 +77,7 @@ Lst_Remove (l, ln)
 
     if (!LstValid (l) ||
 	!LstNodeValid (ln, l)) {
-	    return (FAILURE);
+	    return;
     }
 
     /*
@@ -132,7 +132,5 @@ Lst_Remove (l, ln)
     } else {
 	lNode->flags |= LN_DELETED;
     }
-
-    return (SUCCESS);
 }
 
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index 467fffe486b..d638c3a7f1d 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lstReplace.c,v 1.5 1999/12/18 21:53:34 espie Exp $	*/
+/*	$OpenBSD: lstReplace.c,v 1.6 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: lstReplace.c,v 1.5 1996/11/06 17:59:51 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)lstReplace.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstReplace.c,v 1.5 1999/12/18 21:53:34 espie Exp $";
+static char rcsid[] = "$OpenBSD: lstReplace.c,v 1.6 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -57,24 +57,16 @@ static char rcsid[] = "$OpenBSD: lstReplace.c,v 1.5 1999/12/18 21:53:34 espie Ex
  * Lst_Replace --
  *	Replace the datum in the given node with the new datum
  *
- * Results:
- *	SUCCESS or FAILURE.
- *
  * Side Effects:
  *	The datum field fo the node is altered.
  *
  *-----------------------------------------------------------------------
  */
-ReturnStatus
+void
 Lst_Replace (ln, d)
-    register LstNode	ln;
+    LstNode	ln;
     ClientData	  	d;
 {
-    if (ln == NULL) {
-	return (FAILURE);
-    } else {
+    if (ln != NULL) 
 	((ListNode) ln)->datum = d;
-	return (SUCCESS);
-    }
 }
-
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 0f90e29a8b3..8a6a5a3307e 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.25 1999/12/18 21:53:32 espie Exp $	*/
+/*	$OpenBSD: main.c,v 1.26 1999/12/18 21:58:07 espie Exp $	*/
 /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
 
 /*
@@ -49,7 +49,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.25 1999/12/18 21:53:32 espie Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.26 1999/12/18 21:58:07 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -189,7 +189,7 @@ rearg:	while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
 			break;
 		case 'V':
 			printVars = TRUE;
-			(void)Lst_AtEnd(variables, (ClientData)optarg);
+			Lst_AtEnd(variables, (ClientData)optarg);
 			Var_Append(MAKEFLAGS, "-V", VAR_GLOBAL);
 			Var_Append(MAKEFLAGS, optarg, VAR_GLOBAL);
 			break;
@@ -280,7 +280,7 @@ rearg:	while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
 			Var_Append(MAKEFLAGS, "-e", VAR_GLOBAL);
 			break;
 		case 'f':
-			(void)Lst_AtEnd(makefiles, (ClientData)optarg);
+			Lst_AtEnd(makefiles, (ClientData)optarg);
 			break;
 		case 'i':
 			ignoreErrors = TRUE;
@@ -371,7 +371,7 @@ rearg:	while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
 					optind = 1;     /* - */
 				goto rearg;
 			}
-			(void)Lst_AtEnd(create, (ClientData)estrdup(*argv));
+			Lst_AtEnd(create, (ClientData)estrdup(*argv));
 		}
 }
 
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 7d2e1fdcee5..a539d643a28 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: make.c,v 1.11 1999/12/18 21:56:07 espie Exp $	*/
+/*	$OpenBSD: make.c,v 1.12 1999/12/18 21:58:07 espie Exp $	*/
 /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: make.c,v 1.11 1999/12/18 21:56:07 espie Exp $";
+static char rcsid[] = "$OpenBSD: make.c,v 1.12 1999/12/18 21:58:07 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -298,7 +298,7 @@ MakeAddChild (gnp, lp)
     Lst            l = (Lst) lp;
 
     if (!gn->make && !(gn->type & OP_USE)) {
-	(void)Lst_EnQueue (l, (ClientData)gn);
+	Lst_EnQueue(l, (ClientData)gn);
     }
     return (0);
 }
@@ -340,7 +340,7 @@ Make_HandleUse (cgn, pgn)
 	     * .USE or transformation and target has no commands -- append
 	     * the child's commands to the parent.
 	     */
-	    (void) Lst_Concat (pgn->commands, cgn->commands, LST_CONCNEW);
+	    Lst_Concat (pgn->commands, cgn->commands, LST_CONCNEW);
 	}
 
 	if (Lst_Open (cgn->children) == SUCCESS) {
@@ -348,8 +348,8 @@ Make_HandleUse (cgn, pgn)
 		gn = (GNode *)Lst_Datum (ln);
 
 		if (Lst_Member (pgn->children, gn) == NULL) {
-		    (void) Lst_AtEnd (pgn->children, gn);
-		    (void) Lst_AtEnd (gn->parents, pgn);
+		    Lst_AtEnd(pgn->children, gn);
+		    Lst_AtEnd(gn->parents, pgn);
 		    pgn->unmade += 1;
 		}
 	    }
@@ -522,7 +522,7 @@ Make_Update (cgn)
 	if (succ->make && succ->unmade == 0 && succ->made == UNMADE &&
 	    Lst_Member(toBeMade, (ClientData)succ) == NULL)
 	{
-	    (void)Lst_EnQueue(toBeMade, (ClientData)succ);
+	    Lst_EnQueue(toBeMade, (ClientData)succ);
 	}
     }
 
@@ -850,7 +850,7 @@ Make_Run (targs)
 	    if (gn->unmade != 0) {
 		Lst_ForEach (gn->children, MakeAddChild, (ClientData)examine);
 	    } else {
-		(void)Lst_EnQueue (toBeMade, (ClientData)gn);
+		Lst_EnQueue(toBeMade, (ClientData)gn);
 	    }
 	}
     }
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index d94b1b39d67..f8f278f09c7 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.34 1999/12/18 21:56:07 espie Exp $	*/
+/*	$OpenBSD: parse.c,v 1.35 1999/12/18 21:58:07 espie Exp $	*/
 /*	$NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: parse.c,v 1.34 1999/12/18 21:56:07 espie Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.35 1999/12/18 21:58:07 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -435,9 +435,9 @@ ParseLinkSrc (pgnp, cgnp)
     GNode          *pgn = (GNode *) pgnp;
     GNode          *cgn = (GNode *) cgnp;
     if (Lst_Member (pgn->children, (ClientData)cgn) == NULL) {
-	(void)Lst_AtEnd (pgn->children, (ClientData)cgn);
+	Lst_AtEnd(pgn->children, (ClientData)cgn);
 	if (specType == Not) {
-	    (void)Lst_AtEnd (cgn->parents, (ClientData)pgn);
+	    Lst_AtEnd(cgn->parents, (ClientData)pgn);
 	}
 	pgn->unmade += 1;
     }
@@ -504,7 +504,7 @@ ParseDoOp (gnp, opp)
 	 */
 	Lst_ForEach(gn->parents, ParseLinkSrc, (ClientData)cohort);
 	cohort->type = OP_DOUBLEDEP|OP_INVISIBLE;
-	(void)Lst_AtEnd(gn->cohorts, (ClientData)cohort);
+	Lst_AtEnd(gn->cohorts, (ClientData)cohort);
 
 	/*
 	 * Replace the node in the targets list with the new copy
@@ -552,8 +552,8 @@ ParseAddDep(pp, sp)
 	 * but checking is tedious, and the debugging output can show the
 	 * problem
 	 */
-	(void)Lst_AtEnd(p->successors, (ClientData)s);
-	(void)Lst_AtEnd(s->preds, (ClientData)p);
+	Lst_AtEnd(p->successors, (ClientData)s);
+	Lst_AtEnd(s->preds, (ClientData)p);
 	return 0;
     }
     else
@@ -612,7 +612,7 @@ ParseDoSrc (tOp, src, allsrc)
 	 * invoked if the user didn't specify a target on the command
 	 * line. This is to allow #ifmake's to succeed, or something...
 	 */
-	(void) Lst_AtEnd (create, (ClientData)estrdup(src));
+	Lst_AtEnd(create, (ClientData)estrdup(src));
 	/*
 	 * Add the name to the .TARGETS variable as well, so the user cna
 	 * employ that, if desired.
@@ -627,8 +627,8 @@ ParseDoSrc (tOp, src, allsrc)
 	 */
 	gn = Targ_FindNode(src, TARG_CREATE);
 	if (predecessor != NULL) {
-	    (void)Lst_AtEnd(predecessor->successors, (ClientData)gn);
-	    (void)Lst_AtEnd(gn->preds, (ClientData)predecessor);
+	    Lst_AtEnd(predecessor->successors, (ClientData)gn);
+	    Lst_AtEnd(gn->preds, (ClientData)predecessor);
 	}
 	/*
 	 * The current source now becomes the predecessor for the next one.
@@ -671,7 +671,7 @@ ParseDoSrc (tOp, src, allsrc)
     }
 
     gn->order = waiting;
-    (void)Lst_AtEnd(allsrc, (ClientData)gn);
+    Lst_AtEnd(allsrc, (ClientData)gn);
     if (waiting) {
 	Lst_ForEach(allsrc, ParseAddDep, (ClientData)gn);
     }
@@ -944,7 +944,7 @@ ParseDoDependency (line)
 			if (paths == NULL) {
 			    paths = Lst_Init();
 			}
-			(void)Lst_AtEnd(paths, (ClientData)dirSearchPath);
+			Lst_AtEnd(paths, (ClientData)dirSearchPath);
 			break;
 		    case Main:
 			if (!Lst_IsEmpty(create)) {
@@ -956,12 +956,12 @@ ParseDoDependency (line)
 		    case Interrupt:
 			gn = Targ_FindNode(line, TARG_CREATE);
 			gn->type |= OP_NOTMAIN;
-			(void)Lst_AtEnd(targets, (ClientData)gn);
+			Lst_AtEnd(targets, (ClientData)gn);
 			break;
 		    case Default:
 			gn = Targ_NewGN(".DEFAULT");
 			gn->type |= (OP_NOTMAIN|OP_TRANSFORM);
-			(void)Lst_AtEnd(targets, (ClientData)gn);
+			Lst_AtEnd(targets, (ClientData)gn);
 			DEFAULT = gn;
 			break;
 		    case NotParallel:
@@ -999,7 +999,7 @@ ParseDoDependency (line)
 		    if (paths == NULL) {
 			paths = Lst_Init();
 		    }
-		    (void)Lst_AtEnd(paths, (ClientData)path);
+		    Lst_AtEnd(paths, (ClientData)path);
 		}
 	    }
 	}
@@ -1028,7 +1028,7 @@ ParseDoDependency (line)
 		 * No wildcards, but we want to avoid code duplication,
 		 * so create a list with the word on it.
 		 */
-		(void)Lst_AtEnd(curTargs, (ClientData)line);
+		Lst_AtEnd(curTargs, (ClientData)line);
 	    }
 
 	    while((targName = (char *)Lst_DeQueue(curTargs)) != NULL) {
@@ -1039,7 +1039,7 @@ ParseDoDependency (line)
 		}
 
 		if (gn != NULL)
-		    (void)Lst_AtEnd (targets, (ClientData)gn);
+		    Lst_AtEnd(targets, (ClientData)gn);
 	    }
 	} else if (specType == ExPath && *line != '.' && *line != '\0') {
 	    Parse_Error(PARSE_WARNING, "Extra target (%s) ignored", line);
@@ -1589,7 +1589,7 @@ ParseAddCmd(gnp, cmd)
     GNode *gn = (GNode *) gnp;
     /* if target already supplied, ignore commands */
     if (!(gn->type & OP_HAS_COMMANDS))
-	(void)Lst_AtEnd(gn->commands, cmd);
+	Lst_AtEnd(gn->commands, cmd);
     return(0);
 }
 
@@ -1799,7 +1799,7 @@ ParseDoInclude (file)
     oldFile->p = curPTR;
     oldFile->lineno = lineno;
 
-    (void) Lst_AtFront (includes, (ClientData)oldFile);
+    Lst_AtFront(includes, (ClientData)oldFile);
 
     /*
      * Once the previous state has been saved, we can get down to reading
@@ -1851,7 +1851,7 @@ Parse_FromString(str, newlineno)
     oldFile->F = curFILE;
     oldFile->p = curPTR;
 
-    (void) Lst_AtFront (includes, (ClientData)oldFile);
+    Lst_AtFront(includes, (ClientData)oldFile);
 
     curFILE = NULL;
     curPTR = (PTR *) emalloc (sizeof (PTR));
@@ -1982,7 +1982,7 @@ ParseTraditionalInclude (file)
     oldFile->p = curPTR;
     oldFile->lineno = lineno;
 
-    (void) Lst_AtFront (includes, (ClientData)oldFile);
+    Lst_AtFront(includes, (ClientData)oldFile);
 
     /*
      * Once the previous state has been saved, we can get down to reading
@@ -2683,11 +2683,11 @@ Parse_MainName()
 	Punt ("no target to make.");
     	/*NOTREACHED*/
     } else if (mainNode->type & OP_DOUBLEDEP) {
-	(void) Lst_AtEnd (listmain, (ClientData)mainNode);
+	Lst_AtEnd(listmain, (ClientData)mainNode);
 	Lst_Concat(listmain, mainNode->cohorts, LST_CONCNEW);
     }
     else
-	(void) Lst_AtEnd (listmain, (ClientData)mainNode);
+	Lst_AtEnd(listmain, (ClientData)mainNode);
     return (listmain);
 }
 
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index e6e941e4376..7090f455035 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: suff.c,v 1.19 1999/12/18 21:56:07 espie Exp $	*/
+/*	$OpenBSD: suff.c,v 1.20 1999/12/18 21:58:07 espie Exp $	*/
 /*	$NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-static char rcsid[] = "$OpenBSD: suff.c,v 1.19 1999/12/18 21:56:07 espie Exp $";
+static char rcsid[] = "$OpenBSD: suff.c,v 1.20 1999/12/18 21:58:07 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -454,16 +454,16 @@ SuffInsert (l, s)
 	if (DEBUG(SUFF)) {
 	    printf("at end of list\n");
 	}
-	(void)Lst_AtEnd (l, (ClientData)s);
+	Lst_AtEnd (l, (ClientData)s);
 	s->refCount++;
-	(void)Lst_AtEnd(s->ref, (ClientData) l);
+	Lst_AtEnd(s->ref, (ClientData) l);
     } else if (s2->sNum != s->sNum) {
 	if (DEBUG(SUFF)) {
 	    printf("before %s(%d)\n", s2->name, s2->sNum);
 	}
-	(void)Lst_Insert (l, ln, (ClientData)s);
+	Lst_Insert(l, ln, (ClientData)s);
 	s->refCount++;
-	(void)Lst_AtEnd(s->ref, (ClientData) l);
+	Lst_AtEnd(s->ref, (ClientData) l);
     } else if (DEBUG(SUFF)) {
 	printf("already there\n");
     }
@@ -490,7 +490,7 @@ void
 Suff_ClearSuffixes ()
 {
 #ifdef CLEANUP
-    Lst_Concat (suffClean, sufflist, LST_CONCLINK);
+    Lst_Concat(suffClean, sufflist, LST_CONCLINK);
 #endif
     sufflist = Lst_Init();
     sNum = 0;
@@ -630,7 +630,7 @@ Suff_AddTransform (line)
 	 * by the Parse module.
 	 */
 	gn = Targ_NewGN (line);
-	(void)Lst_AtEnd (transforms, (ClientData)gn);
+	Lst_AtEnd (transforms, (ClientData)gn);
     } else {
 	/*
 	 * New specification for transformation rule. Just nuke the old list
@@ -829,7 +829,7 @@ Suff_AddSuffix (str)
 	s->flags =  	0;
 	s->refCount =	0;
 
-	(void)Lst_AtEnd (sufflist, (ClientData)s);
+	Lst_AtEnd(sufflist, (ClientData)s);
 	/*
 	 * Look for any existing transformations from or to this suffix.
 	 * XXX: Only do this after a Suff_ClearSuffixes?
@@ -1034,7 +1034,7 @@ SuffAddSrc (sp, lsp)
 	s->refCount++;
 	s2->children =	0;
 	targ->children += 1;
-	(void)Lst_AtEnd (ls->l, (ClientData)s2);
+	Lst_AtEnd(ls->l, (ClientData)s2);
 #ifdef DEBUG_SRC
 	s2->cp = Lst_Init();
 	Lst_AtEnd(targ->cp, (ClientData) s2);
@@ -1052,10 +1052,10 @@ SuffAddSrc (sp, lsp)
     s->refCount++;
     s2->children =  0;
     targ->children += 1;
-    (void)Lst_AtEnd (ls->l, (ClientData)s2);
+    Lst_AtEnd(ls->l, (ClientData)s2);
 #ifdef DEBUG_SRC
     s2->cp = Lst_Init();
-    Lst_AtEnd(targ->cp, (ClientData) s2);
+    Lst_AtEnd(targ->cp, (ClientData)s2);
     printf("2 add %x %x to %x:", targ, s2, ls->l);
     Lst_ForEach(ls->l, PrintAddr, (ClientData) 0);
     printf("\n");
@@ -1211,7 +1211,7 @@ SuffFindThem (srcs, slst)
 	}
 
 	SuffAddLevel (srcs, s);
-	Lst_AtEnd(slst, (ClientData) s);
+	Lst_AtEnd(slst, (ClientData)s);
     }
 
     if (DEBUG(SUFF) && rs) {
@@ -1298,9 +1298,9 @@ SuffFindCmds (targ, slst)
 #ifdef DEBUG_SRC
 		    ret->cp = Lst_Init();
 		    printf("3 add %x %x\n", targ, ret);
-		    Lst_AtEnd(targ->cp, (ClientData) ret);
+		    Lst_AtEnd(targ->cp, (ClientData)ret);
 #endif
-		    Lst_AtEnd(slst, (ClientData) ret);
+		    Lst_AtEnd(slst, (ClientData)ret);
 		    if (DEBUG(SUFF)) {
 			printf ("\tusing existing source %s\n", s->name);
 		    }
@@ -1392,7 +1392,7 @@ SuffExpandChildren(cgnp, pgnp)
 			 */
 			*cp++ = '\0';
 			gn = Targ_FindNode(start, TARG_CREATE);
-			(void)Lst_AtEnd(members, (ClientData)gn);
+			Lst_AtEnd(members, (ClientData)gn);
 			while (*cp == ' ' || *cp == '\t') {
 			    cp++;
 			}
@@ -1431,7 +1431,7 @@ SuffExpandChildren(cgnp, pgnp)
 		     * Stuff left over -- add it to the list too
 		     */
 		    gn = Targ_FindNode(start, TARG_CREATE);
-		    (void)Lst_AtEnd(members, (ClientData)gn);
+		    Lst_AtEnd(members, (ClientData)gn);
 		}
 		/*
 		 * Point cp back at the beginning again so the variable value
@@ -1447,9 +1447,9 @@ SuffExpandChildren(cgnp, pgnp)
 		    printf("%s...", gn->name);
 		}
 		if (Lst_Member(pgn->children, (ClientData)gn) == NULL) {
-		    (void)Lst_Append(pgn->children, prevLN, (ClientData)gn);
+		    Lst_Append(pgn->children, prevLN, (ClientData)gn);
 		    prevLN = Lst_Succ(prevLN);
-		    (void)Lst_AtEnd(gn->parents, (ClientData)pgn);
+		    Lst_AtEnd(gn->parents, (ClientData)pgn);
 		    pgn->unmade++;
 		}
 	    }
@@ -1520,9 +1520,9 @@ SuffExpandChildren(cgnp, pgnp)
 	     * up the parent's count of unmade children.
 	     */
 	    if (Lst_Member(pgn->children, (ClientData)gn) == NULL) {
-		(void)Lst_Append(pgn->children, prevLN, (ClientData)gn);
+		Lst_Append(pgn->children, prevLN, (ClientData)gn);
 		prevLN = Lst_Succ(prevLN);
-		(void)Lst_AtEnd(gn->parents, (ClientData)pgn);
+		Lst_AtEnd(gn->parents, (ClientData)pgn);
 		pgn->unmade++;
 	    }
 	}
@@ -1581,8 +1581,8 @@ SuffApplyTransform(tGn, sGn, t, s)
 	 * Not already linked, so form the proper links between the
 	 * target and source.
 	 */
-	(void)Lst_AtEnd(tGn->children, (ClientData)sGn);
-	(void)Lst_AtEnd(sGn->parents, (ClientData)tGn);
+	Lst_AtEnd(tGn->children, (ClientData)sGn);
+	Lst_AtEnd(sGn->parents, (ClientData)tGn);
 	tGn->unmade += 1;
     }
 
@@ -1601,8 +1601,8 @@ SuffApplyTransform(tGn, sGn, t, s)
 		 * Not already linked, so form the proper links between the
 		 * target and source.
 		 */
-		(void)Lst_AtEnd(tGn->children, (ClientData)gn);
-		(void)Lst_AtEnd(gn->parents, (ClientData)tGn);
+		Lst_AtEnd(tGn->children, (ClientData)gn);
+		Lst_AtEnd(gn->parents, (ClientData)tGn);
 		tGn->unmade += 1;
 	    }
 	}
@@ -1652,7 +1652,7 @@ SuffApplyTransform(tGn, sGn, t, s)
      * Keep track of another parent to which this beast is transformed so
      * the .IMPSRC variable can be set correctly for the parent.
      */
-    (void)Lst_AtEnd(sGn->iParents, (ClientData)tGn);
+    Lst_AtEnd(sGn->iParents, (ClientData)tGn);
 
     return(TRUE);
 }
@@ -1715,8 +1715,8 @@ SuffFindArchiveDeps(gn, slst)
      * Create the link between the two nodes right off
      */
     if (Lst_Member(gn->children, (ClientData)mem) == NULL) {
-	(void)Lst_AtEnd(gn->children, (ClientData)mem);
-	(void)Lst_AtEnd(mem->parents, (ClientData)gn);
+	Lst_AtEnd(gn->children, (ClientData)mem);
+	Lst_AtEnd(mem->parents, (ClientData)gn);
 	gn->unmade += 1;
     }
 
@@ -1897,7 +1897,7 @@ SuffFindNormalDeps(gn, slst)
 	    /*
 	     * Record the target so we can nuke it
 	     */
-	    (void)Lst_AtEnd(targs, (ClientData)targ);
+	    Lst_AtEnd(targs, (ClientData)targ);
 
 	    /*
 	     * Search from this suffix's successor...
@@ -1940,7 +1940,7 @@ SuffFindNormalDeps(gn, slst)
 	if (DEBUG(SUFF))
 	    printf("adding suffix rules\n");
 
-	(void)Lst_AtEnd(targs, (ClientData)targ);
+	Lst_AtEnd(targs, (ClientData)targ);
     }
 
     /*
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 2f8ac673de6..f181f8af2d9 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: targ.c,v 1.12 1999/12/18 21:53:33 espie Exp $	*/
+/*	$OpenBSD: targ.c,v 1.13 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: targ.c,v 1.11 1997/02/20 16:51:50 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)targ.c	8.2 (Berkeley) 3/19/94";
 #else
-static char *rcsid = "$OpenBSD: targ.c,v 1.12 1999/12/18 21:53:33 espie Exp $";
+static char *rcsid = "$OpenBSD: targ.c,v 1.13 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -197,7 +197,7 @@ Targ_NewGN (name)
 #ifdef CLEANUP
     if (allGNs == NULL)
 	allGNs = Lst_Init();
-    Lst_AtEnd(allGNs, (ClientData) gn);
+    Lst_AtEnd(allGNs, (ClientData)gn);
 #endif
 
     return (gn);
@@ -270,7 +270,7 @@ Targ_FindNode (name, flags)
 	if (isNew) {
 	    gn = Targ_NewGN (name);
 	    Hash_SetValue (he, gn);
-	    (void) Lst_AtEnd (allTargets, (ClientData)gn);
+	    Lst_AtEnd(allTargets, (ClientData)gn);
 	}
     } else {
 	he = Hash_FindEntry (&targets, name);
@@ -323,9 +323,9 @@ Targ_FindList (names, flags)
 	     * are added to the list in the order in which they were
 	     * encountered in the makefile.
 	     */
-	    (void) Lst_AtEnd (nodes, (ClientData)gn);
+	    Lst_AtEnd(nodes, (ClientData)gn);
 	    if (gn->type & OP_DOUBLEDEP) {
-		(void)Lst_Concat (nodes, gn->cohorts, LST_CONCNEW);
+		Lst_Concat(nodes, gn->cohorts, LST_CONCNEW);
 	    }
 	} else if (flags == TARG_NOCREATE) {
 	    Error ("\"%s\" -- target unknown.", name);
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 73d366cc9e0..578c5332f14 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: var.c,v 1.26 1999/12/18 21:53:33 espie Exp $	*/
+/*	$OpenBSD: var.c,v 1.27 1999/12/18 21:58:08 espie Exp $	*/
 /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
 
 /*
@@ -70,7 +70,7 @@
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: var.c,v 1.26 1999/12/18 21:53:33 espie Exp $";
+static char rcsid[] = "$OpenBSD: var.c,v 1.27 1999/12/18 21:58:08 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -379,8 +379,8 @@ VarAdd(name, val, ctxt)
 
     v->flags = 0;
 
-    (void) Lst_AtFront (ctxt->context, (ClientData)v);
-    (void) Lst_AtEnd (allVars, (ClientData) v);
+    Lst_AtFront(ctxt->context, (ClientData)v);
+    Lst_AtEnd(allVars, (ClientData)v);
     if (DEBUG(VAR)) {
 	printf("%s:%s = %s\n", ctxt->name, name, val);
     }