From 9a296cc4a23e33720d4fd3f447f7488d60c278a3 Mon Sep 17 00:00:00 2001
From: michael <michael@82007160-df01-0410-b94d-b575c5fd34c7>
Date: Tue, 24 Dec 2013 21:15:36 +0000
Subject: - list.c:dlinkFindDelete(): minor readability improvements

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2715 82007160-df01-0410-b94d-b575c5fd34c7
---
 src/list.c | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/list.c b/src/list.c
index 6110e14..e4467a1 100644
--- a/src/list.c
+++ b/src/list.c
@@ -244,35 +244,35 @@ dlink_move_node(dlink_node *m, dlink_list *list_del, dlink_list *list_add)
 dlink_node *
 dlinkFindDelete(dlink_list *list, void *data)
 {
-  dlink_node *m;
+  dlink_node *m = NULL;
 
   DLINK_FOREACH(m, list->head)
   {
-    if (m->data == data)
+    if (m->data != data)
+      continue;
+
+    if (m->next)
+      m->next->prev = m->prev;
+    else
+    {
+      assert(list->tail == m);
+      list->tail = m->prev;
+    }
+
+    if (m->prev)
+      m->prev->next = m->next;
+    else
     {
-      if (m->next)
-        m->next->prev = m->prev;
-      else
-      {
-        assert(list->tail == m);
-        list->tail = m->prev;
-      }
-      if (m->prev)
-        m->prev->next = m->next;
-      else
-      {
-        assert(list->head == m);
-        list->head = m->next;
-      }
-      /* Set this to NULL does matter */
-      m->next = m->prev = NULL;
-      list->length--;
-
-      return m;
+      assert(list->head == m);
+      list->head = m->next;
     }
+
+    /* Set this to NULL does matter */
+    m->next = m->prev = NULL;
+    list->length--;
+
+    return m;
   }
 
   return NULL;
 }
-
-
-- 
cgit