Changeset 594

Show
Ignore:
Timestamp:
07/10/07 06:25:23 (2 years ago)
Author:
plindner
Message:

Use NULL instead of 0, generate bools for ifs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/server/items.c

    r591 r594  
    251251        assert((it->it_flags & ITEM_SLABBED) == 0); 
    252252 
    253         if (it->it_flags & ITEM_LINKED) { 
     253        if (it->it_flags & ITEM_LINKED != 0) { 
    254254            item_unlink_q(it); 
    255255            it->time = current_time; 
     
    383383    item *it = assoc_find(key, nkey); 
    384384    if (delete_locked) *delete_locked = false; 
    385     if (it && (it->it_flags & ITEM_DELETED)) { 
     385    if (it != NULL && (it->it_flags & ITEM_DELETED)) { 
    386386        /* it's flagged as delete-locked.  let's see if that condition 
    387387           is past due, and the 5-second delete_timer just hasn't 
     
    389389        if (!item_delete_lock_over(it)) { 
    390390            if (delete_locked) *delete_locked = true; 
    391             it = 0
     391            it = NULL
    392392        } 
    393393    } 
     
    395395        it->time <= settings.oldest_live) { 
    396396        do_item_unlink(it);           /* MTSAFE - cache_lock held */ 
    397         it = 0
     397        it = NULL
    398398    } 
    399399    if (it != NULL && it->exptime != 0 && it->exptime <= current_time) { 
    400400        do_item_unlink(it);           /* MTSAFE - cache_lock held */ 
    401         it = 0
     401        it = NULL
    402402    } 
    403403