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

Diff for /embedaddon/php/ext/standard/php_var.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:48:02 version 1.1.1.2, 2012/05/29 12:34:43
Line 12 Line 12
    | obtain it through the world-wide-web, please send a note to          |     | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |     | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Author: Jani Lehtimäki <jkl@njet.net>                                |   | Author: Jani Lehtimäki <jkl@njet.net>                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
 */  */
   
Line 21 Line 21
 #ifndef PHP_VAR_H  #ifndef PHP_VAR_H
 #define PHP_VAR_H  #define PHP_VAR_H
   
   #include "ext/standard/basic_functions.h"
 #include "ext/standard/php_smart_str_public.h"  #include "ext/standard/php_smart_str_public.h"
   
 PHP_FUNCTION(var_dump);  PHP_FUNCTION(var_dump);
Line 37  PHPAPI void php_var_export_ex(zval **struc, int level, Line 38  PHPAPI void php_var_export_ex(zval **struc, int level,
   
 PHPAPI void php_debug_zval_dump(zval **struc, int level TSRMLS_DC);  PHPAPI void php_debug_zval_dump(zval **struc, int level TSRMLS_DC);
   
/* typdef HashTable php_serialize_data_t; */typedef HashTable* php_serialize_data_t;
#define php_serialize_data_t HashTable 
   
 struct php_unserialize_data {  struct php_unserialize_data {
         void *first;          void *first;
           void *last;
         void *first_dtor;          void *first_dtor;
           void *last_dtor;
 };  };
   
typedef struct php_unserialize_data php_unserialize_data_t;typedef struct php_unserialize_data* php_unserialize_data_t;
   
 PHPAPI void php_var_serialize(smart_str *buf, zval **struc, php_serialize_data_t *var_hash TSRMLS_DC);  PHPAPI void php_var_serialize(smart_str *buf, zval **struc, php_serialize_data_t *var_hash TSRMLS_DC);
 PHPAPI int php_var_unserialize(zval **rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC);  PHPAPI int php_var_unserialize(zval **rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC);
   
#define PHP_VAR_SERIALIZE_INIT(var_hash) \#define PHP_VAR_SERIALIZE_INIT(var_hash_ptr) \
   zend_hash_init(&(var_hash), 10, NULL, NULL, 0)do  { \
#define PHP_VAR_SERIALIZE_DESTROY(var_hash) \        /* fprintf(stderr, "SERIALIZE_INIT      == lock: %u, level: %u\n", BG(serialize_lock), BG(serialize).level); */ \
   zend_hash_destroy(&(var_hash))        if (BG(serialize_lock) || !BG(serialize).level) { \
                 ALLOC_HASHTABLE(var_hash_ptr); \
                 zend_hash_init((var_hash_ptr), 10, NULL, NULL, 0); \
                 if (!BG(serialize_lock)) { \
                         BG(serialize).var_hash = (void *)(var_hash_ptr); \
                         BG(serialize).level = 1; \
                 } \
         } else { \
                 (var_hash_ptr) = (php_serialize_data_t)BG(serialize).var_hash; \
                 ++BG(serialize).level; \
         } \
 } while(0)
   
#define PHP_VAR_UNSERIALIZE_INIT(var_hash) \#define PHP_VAR_SERIALIZE_DESTROY(var_hash_ptr) \
        (var_hash).first = 0; \do { \
        (var_hash).first_dtor = 0        /* fprintf(stderr, "SERIALIZE_DESTROY   == lock: %u, level: %u\n", BG(serialize_lock), BG(serialize).level); */ \
#define PHP_VAR_UNSERIALIZE_DESTROY(var_hash) \        if (BG(serialize_lock) || !BG(serialize).level) { \
        var_destroy(&(var_hash))                zend_hash_destroy((var_hash_ptr)); \
                 FREE_HASHTABLE(var_hash_ptr); \
         } else { \
                 if (!--BG(serialize).level) { \
                         zend_hash_destroy((php_serialize_data_t)BG(serialize).var_hash); \
                         FREE_HASHTABLE((php_serialize_data_t)BG(serialize).var_hash); \
                         BG(serialize).var_hash = NULL; \
                 } \
         } \
 } while (0)
 
 #define PHP_VAR_UNSERIALIZE_INIT(var_hash_ptr) \
 do { \
         /* fprintf(stderr, "UNSERIALIZE_INIT    == lock: %u, level: %u\n", BG(serialize_lock), BG(unserialize).level); */ \
         if (BG(serialize_lock) || !BG(unserialize).level) { \
                 (var_hash_ptr) = (php_unserialize_data_t)ecalloc(1, sizeof(struct php_unserialize_data)); \
                 if (!BG(serialize_lock)) { \
                         BG(unserialize).var_hash = (void *)(var_hash_ptr); \
                         BG(unserialize).level = 1; \
                 } \
         } else { \
                 (var_hash_ptr) = (php_unserialize_data_t)BG(unserialize).var_hash; \
                 ++BG(unserialize).level; \
         } \
 } while (0)
 
 #define PHP_VAR_UNSERIALIZE_DESTROY(var_hash_ptr) \
 do { \
         /* fprintf(stderr, "UNSERIALIZE_DESTROY == lock: %u, level: %u\n", BG(serialize_lock), BG(unserialize).level); */ \
         if (BG(serialize_lock) || !BG(unserialize).level) { \
                 var_destroy(&(var_hash_ptr)); \
                 efree(var_hash_ptr); \
         } else { \
                 if (!--BG(unserialize).level) { \
                         var_destroy(&(var_hash_ptr)); \
                         efree((var_hash_ptr)); \
                         BG(unserialize).var_hash = NULL; \
                 } \
         } \
 } while (0)
   
 PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval **nzval);  PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval **nzval);
 PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval **val);  PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval **val);
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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