slight cleanup to the linked list handling

(This used to be commit 97b62b347648411d034ab91845ae607eca4dfad6)

2 files changed, 20 insertions, 29 deletions

diff --git a/source3/namebrowse.c b/source3/namebrowse.c
index c0deaff0fa..2f883d4450 100644
--- a/source3/namebrowse.c
+++ b/source3/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/source3/namedbserver.c b/source3/namedbserver.c
index 7440b42494..c3f6076f49 100644
--- a/source3/namedbserver.c
+++ b/source3/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);
+	    }
     }
 }