Changeset 24 for branches/FREEBSD/src/kmk/lst.lib/lstConcat.c

Timestamp:

Nov 26, 2002, 10:24:54 PM (23 years ago)

Author:

bird

Message:

Import of RELENG_4_7_0_RELEASE

File:

• branches/FREEBSD/src/kmk/lst.lib/lstConcat.c (modified) (7 diffs)

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

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstConcat.c      8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstConcat.c,v 1.7 1999/08/28 01:03:47 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstConcat.c,v 1.11 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstConcat.c 8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -85 +84 @@
 
     if (flags == LST_CONCLINK) {
-        if (list2->firstPtr != NULL) {
+        if (list2->firstPtr != NilListNode) {
             /*
              * We set the nextPtr of the
-             * last element of list two to be NULL to make the loop easier and
+             * last element of list two to be NIL to make the loop easier and
              * so we don't need an extra case should the first list turn
              * out to be non-circular -- the final element will already point
-             * to NULL space and the first element will be untouched if it
-             * existed before and will also point to NULL space if it didn't.
+             * to NIL space and the first element will be untouched if it
+             * existed before and will also point to NIL space if it didn't.
              */
-            list2->lastPtr->nextPtr = NULL;
+            list2->lastPtr->nextPtr = NilListNode;
             /*
              * So long as the second list isn't empty, we just link the
@@ -104 +103 @@
              */
             list2->firstPtr->prevPtr = list1->lastPtr;
-            if (list1->lastPtr != NULL) {
+            if (list1->lastPtr != NilListNode) {
                 list1->lastPtr->nextPtr = list2->firstPtr;
             } else {
@@ -111 +110 @@
             list1->lastPtr = list2->lastPtr;
         }
-        if (list1->isCirc && list1->firstPtr != NULL) {
+        if (list1->isCirc && list1->firstPtr != NilListNode) {
             /*
              * If the first list is supposed to be circular and it is (now)
@@ -120 +119 @@
             list1->lastPtr->nextPtr = list1->firstPtr;
         }
-        free (l2);
-    } else if (list2->firstPtr != NULL) {
+        free ((Address)l2);
+    } else if (list2->firstPtr != NilListNode) {
         /*
-         * We set the nextPtr of the last element of list 2 to be NULL to make
+         * We set the nextPtr of the last element of list 2 to be nil to make
          * the loop less difficult. The loop simply goes through the entire
          * second list creating new LstNodes and filling in the nextPtr, and
@@ -130 +129 @@
          * follows the last of the new nodes along until the entire l2 has
          * been appended. Only then does the bookkeeping catch up with the
-         * changes. During the first iteration of the loop, if 'last' is NULL,
+         * changes. During the first iteration of the loop, if 'last' is nil,
          * the first list must have been empty so the newly-created node is
          * made the first node of the list.
          */
-        list2->lastPtr->nextPtr = NULL;
+        list2->lastPtr->nextPtr = NilListNode;
         for (last = list1->lastPtr, ln = list2->firstPtr;
-             ln != NULL;
+             ln != NilListNode;
              ln = ln->nextPtr)
         {
             PAlloc (nln, ListNode);
             nln->datum = ln->datum;
-            if (last != NULL) {
+            if (last != NilListNode) {
                 last->nextPtr = nln;
             } else {
@@ -167 +166 @@
             list1->firstPtr->prevPtr = list1->lastPtr;
         } else {
-            last->nextPtr = NULL;
+            last->nextPtr = NilListNode;
         }