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

Diff for /embedaddon/php/ext/standard/var.c between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2013/07/22 01:32:05 version 1.1.1.4, 2014/06/15 20:03:57
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2013 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 436  PHPAPI void php_var_export_ex(zval **struc, int level, Line 436  PHPAPI void php_var_export_ex(zval **struc, int level,
                 smart_str_append_long(buf, Z_LVAL_PP(struc));                  smart_str_append_long(buf, Z_LVAL_PP(struc));
                 break;                  break;
         case IS_DOUBLE:          case IS_DOUBLE:
                tmp_len = spprintf(&tmp_str, 0,"%.*H", (int) EG(precision), Z_DVAL_PP(struc));                tmp_len = spprintf(&tmp_str, 0,"%.*H", PG(serialize_precision), Z_DVAL_PP(struc));
                 smart_str_appendl(buf, tmp_str, tmp_len);                  smart_str_appendl(buf, tmp_str, tmp_len);
                 efree(tmp_str);                  efree(tmp_str);
                 break;                  break;
Line 549  static inline int php_add_var_hash(HashTable *var_hash Line 549  static inline int php_add_var_hash(HashTable *var_hash
         char id[32], *p;          char id[32], *p;
         register int len;          register int len;
   
         /* relies on "(long)" being a perfect hash function for data pointers,  
          * however the actual identity of an object has had to be determined  
          * by its object handle since 5.0. */  
         if ((Z_TYPE_P(var) == IS_OBJECT) && Z_OBJ_HT_P(var)->get_class_entry) {          if ((Z_TYPE_P(var) == IS_OBJECT) && Z_OBJ_HT_P(var)->get_class_entry) {
                p = smart_str_print_long(id + sizeof(id) - 1, (long) Z_OBJ_HANDLE_P(var));                p = smart_str_print_long(id + sizeof(id) - 1,
                                 (long) zend_objects_get_address(var TSRMLS_CC));
                 *(--p) = 'O';                  *(--p) = 'O';
                 len = id + sizeof(id) - 1 - p;                  len = id + sizeof(id) - 1 - p;
         } else {          } else {
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

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