- if (!sess->snac_hash[i])
- ;
- else if (!sess->snac_hash[i]->next) {
- if ((sess->snac_hash[i]->issuetime + maxage) >= curtime) {
- remed = sess->snac_hash[i];
- if(remed->data)
- free(remed->data);
- free(remed);
- sess->snac_hash[i] = NULL;
- }
- } else {
- cur = sess->snac_hash[i];
- while(cur && cur->next) {
- if ((cur->next->issuetime + maxage) >= curtime) {
- remed = cur->next;
- cur->next = cur->next->next;
- if (remed->data)
- free(remed->data);
- free(remed);
- }
- cur = cur->next;
+ if (!sess->snac_hash[i]) {
+ faim_mutex_unlock(&sess->snac_hash_locks[i]);
+ continue;
+ }
+
+ curtime = time(NULL); /* done here in case we waited for the lock */
+
+ cur = sess->snac_hash[i];
+ while (cur) {
+ next = cur->next;
+ if ((curtime - cur->issuetime) > maxage) {
+ if (sess->snac_hash[i] == cur)
+ prev = sess->snac_hash[i] = next;
+ else
+ prev->next = next;
+
+ /* XXX should we have destructors here? */
+ if (cur->data)
+ free(cur->data);
+ free(cur);
+
+ } else {
+ prev = cur;