slight cleanup to the linked list handling

diff --git a/source/namebrowse.c b/source/namebrowse.c
index c0deaff0faec73f096e9e98d2f726f33f8fa5e1c..2f883d44506f1f4dfe87d6bc2b531c23f105073b 100644 (file)
--- a/source/namebrowse.c
+++ b/source/namebrowse.c
@@ -72,22 +72,17 @@ void expire_browse_cache(time_t t)
   /* expire old entries in the serverlist */
   for (b = browserlist; b; b = nextb)
     {
-      if (b->synced && b->sync_time < t)
-       {
-         DEBUG(3,("Removing dead cached browser %s\n",b->name));
-         nextb = b->next;
+           nextb = b->next;
+           if (b->synced && b->sync_time < t) {
+                   DEBUG(3,("Removing dead cached browser %s\n",b->name));
          
-         if (b->prev) b->prev->next = b->next;
-         if (b->next) b->next->prev = b->prev;
+                   if (b->prev) b->prev->next = b->next;
+                   if (b->next) b->next->prev = b->prev;
          
-         if (browserlist == b) browserlist = b->next; 
-         
-         free(b);
-       }
-      else
-       {
-         nextb = b->next;
-       }
+                   if (browserlist == b) browserlist = b->next; 
+                   
+                   free(b);
+           }
     }
 }
 

diff --git a/source/namedbserver.c b/source/namedbserver.c
index 7440b42494a1438ebfd979a250c8112cb8d6fdcc..c3f6076f49bfd981a16c4a4cc51d4239bf396fc3 100644 (file)
--- a/source/namedbserver.c
+++ b/source/namedbserver.c
@@ -58,24 +58,20 @@ void remove_old_servers(struct work_record *work, time_t t,
   /* expire old entries in the serverlist */
   for (s = work->serverlist; s; s = nexts)
     {
-      if (remove_all || (s->death_time && (t == -1 || s->death_time < t)))
-       {
-         DEBUG(3,("Removing dead server %s\n",s->serv.name));
-         updatedlists = True;
-         nexts = s->next;
+           nexts = s->next;
+           if (remove_all || 
+               (s->death_time && (t == -1 || s->death_time < t))) {
+                   DEBUG(3,("Removing dead server %s\n",s->serv.name));
+                   updatedlists = True;
          
-         if (s->prev) s->prev->next = s->next;
-         if (s->next) s->next->prev = s->prev;
+                   if (s->prev) s->prev->next = s->next;
+                   if (s->next) s->next->prev = s->prev;
          
-         if (work->serverlist == s) 
-           work->serverlist = s->next; 
+                   if (work->serverlist == s) 
+                           work->serverlist = s->next; 
 
-         free(s);
-       }
-      else
-       {
-         nexts = s->next;
-       }
+                   free(s);
+           }
     }
 }