Changeset 540

Show
Ignore:
Timestamp:
12/26/06 14:13:41 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/cherokee/balancer_round_robin.h

    r387 r540  
    3939} cherokee_balancer_round_robin_t; 
    4040 
    41 #define BAL_RR(x)       ((cherokee_balancer_round_robin_file_t *)(x)) 
     41#define BAL_RR(x)       ((cherokee_balancer_round_robin_t *)(x)) 
    4242 
    4343 

  • cherokee/trunk/cherokee/buffer.c

    r534 r540  
    14461446 
    14471447        /* Verify formal parameters 
    1448          * (those which are not tested should raise a segment violation). 
     1448         * (those which are not tested would raise a segment violation). 
    14491449         */ 
    14501450        if (buf->buf == NULL || 
    …… 
    14631463 
    14641464                result_length += (replacement_length - substring_length); 
    1465         }  
    1466  
     1465        } 
     1466         
    14671467        /* If no substring have been found, then return now. 
    14681468         */ 
    …… 
    14811481         */ 
    14821482        result = (char *) malloc (result_length + 1); 
    1483         if (result == NULL) 
     1483        if (unlikely (result == NULL)) 
    14841484                return ret_nomem; 
    14851485