Changeset 106

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/ChangeLog

    r104 r106  
     12005-05-22 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
     2 
     3        * Bumped version to 0.9.4-dev 
     4        * Changed hash_mm prototype in eaccelerator.h to non-inline (Compaq c compiler) 
     5        * Fixes from patch 1206311 + some unused variable clean ups 
     6 
    172005-05-18 Franck Tabary <franck34 at users.sourceforge.net> 
    28 
    39        * released eAccelerator 0.9.3 final 
    4          
     10 
    5112005-05-16 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
     12 
    613        * Added --without-eaccelerator-use-inode configure switch to disable the use 
    714          of inode numbers for the hash keys (Feature request 1201159). The default 
    …… 
    1017 
    11182005-05-15 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
     19 
    1220        * Compile fix for bug 1201564. 
    1321 
    …… 
    3341 
    34422005-05-09 Franck Tabary <franck34 at users.sourceforge.net> 
     43 
    3544        * released eAccelerator 0.9.3-rc1 
    3645 

  • 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 

  • eaccelerator/trunk/eaccelerator.h

    r101 r106  
    44   +----------------------------------------------------------------------+ 
    55   | Copyright (c) 2004 - 2005 eAccelerator                               | 
    6    | http://eaccelerator.net                                                     | 
     6   | http://eaccelerator.net                                              | 
    77   +----------------------------------------------------------------------+ 
    88   | This program is free software; you can redistribute it and/or        | 
    …… 
    406406void fixup_zval (zval * z TSRMLS_DC); 
    407407 
    408 inline unsigned int hash_mm (const char *data, int len); 
     408unsigned int hash_mm(const char *data, int len);  
    409409 
    410410#  ifdef WITH_EACCELERATOR_EXECUTOR 

  • eaccelerator/trunk/eaccelerator_version.h

    r103 r106  
    11#ifndef EACCELERATOR_VERSION 
    2 #define EACCELERATOR_VERSION "0.9.3" 
     2#define EACCELERATOR_VERSION "0.9.4-dev" 
    33#endif 

  • eaccelerator/trunk/loader.c

    r95 r106  
    8383    zend_bailout(); 
    8484  } 
    85 #ifdef ZEND_ENGINE_2 
    86   return (unsigned int)(((temp_variable*)NULL) + var); 
    87 #else 
    8885  return var; 
    89 #endif 
    9086} 
    9187 

  • eaccelerator/trunk/session.c

    r99 r106  
    149149        char *skey; 
    150150        int len; 
    151         char *tmp; 
    152151        time_t ttl; 
    153152        zval sval; 
    …… 
    241240                        unsigned char buf[2048]; 
    242241                        int n; 
    243                         int to_read = entropy_length; 
     242                        size_t to_read = entropy_length; 
    244243 
    245244                        while (to_read > 0) { 
    …… 
    322321        char *key; 
    323322        int len; 
    324         char *tmp; 
    325323        time_t ttl; 
    326324