[BACK]Return to zend_ini.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / Zend

Diff for /embedaddon/php/Zend/zend_ini.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:47:52 version 1.1.1.2, 2012/05/29 12:34:35
Line 92  ZEND_API int zend_ini_startup(TSRMLS_D) /* {{{ */ Line 92  ZEND_API int zend_ini_startup(TSRMLS_D) /* {{{ */
   
         EG(ini_directives) = registered_zend_ini_directives;          EG(ini_directives) = registered_zend_ini_directives;
         EG(modified_ini_directives) = NULL;          EG(modified_ini_directives) = NULL;
           EG(error_reporting_ini_entry) = NULL;
         if (zend_hash_init_ex(registered_zend_ini_directives, 100, NULL, NULL, 1, 0) == FAILURE) {          if (zend_hash_init_ex(registered_zend_ini_directives, 100, NULL, NULL, 1, 0) == FAILURE) {
                 return FAILURE;                  return FAILURE;
         }          }
Line 133  ZEND_API int zend_copy_ini_directives(TSRMLS_D) /* {{{ Line 134  ZEND_API int zend_copy_ini_directives(TSRMLS_D) /* {{{
         zend_ini_entry ini_entry;          zend_ini_entry ini_entry;
   
         EG(modified_ini_directives) = NULL;          EG(modified_ini_directives) = NULL;
           EG(error_reporting_ini_entry) = NULL;
         EG(ini_directives) = (HashTable *) malloc(sizeof(HashTable));          EG(ini_directives) = (HashTable *) malloc(sizeof(HashTable));
         if (zend_hash_init_ex(EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, NULL, 1, 0) == FAILURE) {          if (zend_hash_init_ex(EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, NULL, 1, 0) == FAILURE) {
                 return FAILURE;                  return FAILURE;
Line 145  ZEND_API int zend_copy_ini_directives(TSRMLS_D) /* {{{ Line 147  ZEND_API int zend_copy_ini_directives(TSRMLS_D) /* {{{
   
 static int ini_key_compare(const void *a, const void *b TSRMLS_DC) /* {{{ */  static int ini_key_compare(const void *a, const void *b TSRMLS_DC) /* {{{ */
 {  {
        Bucket *f;        const Bucket *f;
        Bucket *s;        const Bucket *s;
   
        f = *((Bucket **) a);        f = *((const Bucket **) a);
        s = *((Bucket **) b);        s = *((const Bucket **) b);
   
         if (f->nKeyLength == 0 && s->nKeyLength == 0) { /* both numeric */          if (f->nKeyLength == 0 && s->nKeyLength == 0) { /* both numeric */
                 return ZEND_NORMALIZE_BOOL(f->nKeyLength - s->nKeyLength);                  return ZEND_NORMALIZE_BOOL(f->nKeyLength - s->nKeyLength);
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>