Changeset a85d225

Timestamp:

Oct 7, 2009, 12:46:39 AM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

6c171f1

Parents:

5791bf7

git-author:

Anders Kaseorg <andersk@mit.edu> (10/03/09 19:38:43)

git-committer:

Anders Kaseorg <andersk@mit.edu> (10/07/09 00:46:39)

Message:

oe_release_excursion: Simplify linked list deletion code.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• editwin.c (modified) (1 diff)

editwin.c

@@ -326 +326 @@
 static void oe_release_excursion(owl_editwin *e, oe_excursion *x)
 {
-  oe_excursion *p;
+  oe_excursion **px;
 
   x->valid = 0;
-  if (e->excursions == NULL)
-    /* XXX huh. */ ;
-  else if (e->excursions == x)
-    e->excursions = x->next;
-  else {
-    for (p = e->excursions; p->next != NULL; p = p->next)
-      if (p->next == x) {
-        p->next = p->next->next;
-        break;
-      }
-    /* and if we ran off the end? XXX */
-  }
+  for (px = &e->excursions; *px != NULL; px = &(*px)->next)
+    if (*px == x) {
+      *px = x->next;
+      return;
+    }
+  abort();
 }