diff options
author | Andrew Tridgell <tridge@samba.org> | 1997-12-03 05:54:51 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 1997-12-03 05:54:51 +0000 |
commit | 97b62b347648411d034ab91845ae607eca4dfad6 (patch) | |
tree | c37880d3238e2327e08441d199828ca2bbdfa444 | |
parent | e439115366804982af6faba75714dbe2626edead (diff) | |
download | samba-97b62b347648411d034ab91845ae607eca4dfad6.tar.gz samba-97b62b347648411d034ab91845ae607eca4dfad6.tar.xz samba-97b62b347648411d034ab91845ae607eca4dfad6.zip |
slight cleanup to the linked list handling
-rw-r--r-- | source/namebrowse.c | 23 | ||||
-rw-r--r-- | source/namedbserver.c | 26 |
2 files changed, 20 insertions, 29 deletions
diff --git a/source/namebrowse.c b/source/namebrowse.c index c0deaff0fae..2f883d44506 100644 --- 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 7440b42494a..c3f6076f49b 100644 --- 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); + } } } |