Changeset 336

Show
Ignore:
Timestamp:
08/20/07 20:12:03 (9 months ago)
Author:
bart
Message:

Fix some compile warnings introduced by today's and yesterday's refactorings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/ea_store.c

    r334 r336  
    200200#endif 
    201201    if (from->type == ZEND_INTERNAL_FUNCTION) { 
    202         return; 
     202        return size; 
    203203    } 
    204204 
    …… 
    916916 
    917917    p = (char *)entry; 
    918     ALLOCATE(&p, offsetof(ea_cache_entry, realfilename) + len + 1); 
     918    x = ALLOCATE(&p, offsetof(ea_cache_entry, realfilename) + len + 1); 
     919    x = NULL; 
    919920 
    920921    entry->nhits = 0; 

  • eaccelerator/trunk/eaccelerator.c

    r333 r336  
    368368} 
    369369 
     370#ifdef DEBUG 
    370371static void decode_version(int version, int extra, char *str, size_t len) 
    371372{ 
    …… 
    406407    } 
    407408} 
     409#endif 
    408410 
    409411static char num2hex[] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; 

  • eaccelerator/trunk/shm.c

    r327 r336  
    103103        char *key; 
    104104        int key_len; 
    105         zval *val, *result; 
     105        zval *val, *result = NULL; 
    106106        time_t ttl = 0; 
    107107        long where = eaccelerator_keys_cache_place; 
    …… 
    154154            const unsigned char *p; 
    155155            php_unserialize_data_t var_hash; 
    156             zval *object; 
    157156 
    158157            /* 
    …… 
    165164            p = (const unsigned char *)Z_STRVAL_P(return_value); 
    166165            if (!php_var_unserialize(&return_value, &p, p + Z_STRLEN_P(return_value), &var_hash TSRMLS_CC)) { 
    167                 zval_dtor(object); 
    168                 Z_TYPE_P(object) = IS_NULL; 
     166                zval_dtor(return_value); 
     167                Z_TYPE_P(return_value) = IS_NULL; 
    169168            } 
    170169            PHP_VAR_UNSERIALIZE_DESTROY(var_hash);