Changeset 594
- Timestamp:
- 07/10/07 06:25:23 (2 years ago)
- Files:
-
- trunk/server/items.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/server/items.c
r591 r594 251 251 assert((it->it_flags & ITEM_SLABBED) == 0); 252 252 253 if (it->it_flags & ITEM_LINKED ) {253 if (it->it_flags & ITEM_LINKED != 0) { 254 254 item_unlink_q(it); 255 255 it->time = current_time; … … 383 383 item *it = assoc_find(key, nkey); 384 384 if (delete_locked) *delete_locked = false; 385 if (it && (it->it_flags & ITEM_DELETED)) {385 if (it != NULL && (it->it_flags & ITEM_DELETED)) { 386 386 /* it's flagged as delete-locked. let's see if that condition 387 387 is past due, and the 5-second delete_timer just hasn't … … 389 389 if (!item_delete_lock_over(it)) { 390 390 if (delete_locked) *delete_locked = true; 391 it = 0;391 it = NULL; 392 392 } 393 393 } … … 395 395 it->time <= settings.oldest_live) { 396 396 do_item_unlink(it); /* MTSAFE - cache_lock held */ 397 it = 0;397 it = NULL; 398 398 } 399 399 if (it != NULL && it->exptime != 0 && it->exptime <= current_time) { 400 400 do_item_unlink(it); /* MTSAFE - cache_lock held */ 401 it = 0;401 it = NULL; 402 402 } 403 403
