Changeset 24 for branches/FREEBSD/src/kmk/lst.lib/lstRemove.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/lstRemove.c (modified) (6 diffs)

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

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstRemove.c      8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstRemove.c,v 1.6 1999/08/28 01:03:56 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstRemove.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstRemove.c 8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -58 +57 @@
  *
  * Side Effects:
- *      The list's firstPtr will be set to NULL if ln is the last
+ *      The list's firstPtr will be set to NilListNode if ln is the last
  *      node on the list. firsPtr and lastPtr will be altered if ln is
  *      either the first or last node, respectively, on the list.
@@ -80 +79 @@
      * unlink it from the list
      */
-    if (lNode->nextPtr != NULL) {
+    if (lNode->nextPtr != NilListNode) {
         lNode->nextPtr->prevPtr = lNode->prevPtr;
     }
-    if (lNode->prevPtr != NULL) {
+    if (lNode->prevPtr != NilListNode) {
         lNode->prevPtr->nextPtr = lNode->nextPtr;
     }
@@ -101 +100 @@
      * Sequential access stuff. If the node we're removing is the current
      * node in the list, reset the current node to the previous one. If the
-     * previous one was non-existent (prevPtr == NULL), we set the
+     * previous one was non-existent (prevPtr == NilListNode), we set the
      * end to be Unknown, since it is.
      */
     if (list->isOpen && (list->curPtr == lNode)) {
         list->curPtr = list->prevPtr;
-        if (list->curPtr == NULL) {
+        if (list->curPtr == NilListNode) {
             list->atEnd = Unknown;
         }
@@ -117 +116 @@
      */
     if (list->firstPtr == lNode) {
-        list->firstPtr = NULL;
+        list->firstPtr = NilListNode;
     }
 
@@ -125 +124 @@
      */
     if (lNode->useCount == 0) {
-        free (ln);
+        free ((Address)ln);
     } else {
         lNode->flags |= LN_DELETED;