Show
Ignore:
Timestamp:
05/23/05 13:03:17 (4 years ago)
Author:
zoeloelip
Message:

* Bumped version to 0.9.4-dev
* Changed hash_mm prototype in eaccelerator.h to non-inline (Compaq c compiler)
* Fixes from patch 1206311 + some unused variable clean ups

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/eaccelerator.c

    r94 r106  
    134134 
    135135/******************************************************************************/ 
    136 /* hash mm functions                                                                                                              */ 
    137 /* TODO: insert items sorted in buckets, so searching in buckets goes from        */ 
    138 /*                      O(n) to O(log n) 
     136/* hash mm functions                                                          */ 
    139137/******************************************************************************/ 
    140138 
    141 /* Create a key for the scripts hashtable. This is only used when eA can't use 
    142    inodes. */ 
    143139inline unsigned int hash_mm(const char *data, int len) { 
    144140  unsigned int h; 
    …… 
    11631159/* Calculate the size of a class entry */ 
    11641160static void calc_class_entry(zend_class_entry* from TSRMLS_DC) { 
    1165   int i; 
     1161/*  int i; */ 
    11661162 
    11671163  if (from->type != ZEND_USER_CLASS) { 
    …… 
    16361632static eaccelerator_class_entry* store_class_entry(zend_class_entry* from TSRMLS_DC) { 
    16371633  eaccelerator_class_entry *to; 
    1638   int i; 
     1634/*  int i; */ 
    16391635 
    16401636  EACCELERATOR_ALIGN(MMCG(mem)); 
    …… 
    20622058 
    20632059#ifdef ZEND_ENGINE_2 
    2064   int    fname_len; 
    2065   char  *fname_lc; 
     2060  int    fname_len = 0; 
     2061  char  *fname_lc = NULL; 
    20662062#endif 
    20672063 
    …… 
    31843180          t->opcodes[0].op1.op_type == IS_CONST && 
    31853181          t->opcodes[0].op1.u.constant.type == IS_STRING) { 
    3186         zend_op_array* new_t; 
     3182        zend_op_array* new_t = NULL; 
    31873183        zend_bool old_in_compilation = CG(in_compilation); 
    31883184        char* old_filename = CG(compiled_filename); 
    …… 
    40954091  PHP_FE(eaccelerator_crash, NULL) 
    40964092#endif 
     4093#ifdef ZEND_ENGINE_2 
     4094  {NULL, NULL, NULL, 0U, 0U} 
     4095#else 
    40974096  {NULL, NULL, NULL} 
     4097#endif 
    40984098}; 
    40994099