Changeset 24 in kBuild for branches/FREEBSD/src/kmk/lst.lib/lstDupl.c

Timestamp:

Nov 26, 2002 9:24:54 PM (22 years ago)

Author:

bird

Message:

Import of RELENG_4_7_0_RELEASE

File:

• branches/FREEBSD/src/kmk/lst.lib/lstDupl.c (modified) (4 diffs)

branches/FREEBSD/src/kmk/lst.lib/lstDupl.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstDupl.c        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDupl.c,v 1.7 1999/08/28 01:03:49 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDupl.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstDupl.c   8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -53 +52 @@
  *-----------------------------------------------------------------------
  * Lst_Duplicate --
- *      Duplicate an entire list. If a function to copy a void * is
+ *      Duplicate an entire list. If a function to copy a ClientData is
  *      given, the individual client elements will be duplicated as well.
  *
  * Results:
- *      The new Lst structure or NULL if failure.
+ *      The new Lst structure or NILLST if failure.
  *
  * Side Effects:
@@ -66 +65 @@
 Lst_Duplicate (l, copyProc)
     Lst           l;             /* the list to duplicate */
-    /* A function to duplicate each void * */
-    void *        (*copyProc)(void *);
+    /* A function to duplicate each ClientData */
+    ClientData    (*copyProc) __P((ClientData));
 {
     register Lst        nl;
@@ -74 +73 @@
 
     if (!LstValid (l)) {
-        return (NULL);
+        return (NILLST);
     }
 
     nl = Lst_Init (list->isCirc);
-    if (nl == NULL) {
-        return (NULL);
+    if (nl == NILLST) {
+        return (NILLST);
     }
 
     ln = list->firstPtr;
-    while (ln != NULL) {
+    while (ln != NilListNode) {
         if (copyProc != NOCOPY) {
             if (Lst_AtEnd (nl, (*copyProc) (ln->datum)) == FAILURE) {
-                return (NULL);
+                return (NILLST);
             }
         } else if (Lst_AtEnd (nl, ln->datum) == FAILURE) {
-            return (NULL);
+            return (NILLST);
         }
 
         if (list->isCirc && ln == list->lastPtr) {
-            ln = NULL;
+            ln = NilListNode;
         } else {
             ln = ln->nextPtr;