cvs: php-src /ext/standard var.c

tony2001 Fri Aug 12 14:54:19 2005 EDT Modified files: /php-src/ext/standard var.c Log: change ["var_name":private"] -> ["var_name:private"] * I'm also not sure we want ["var_name:public"], but I left it as is. http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.204&r2=1.205&ty=u Index: php-src/ext/standard/var.c diff -u php-src/ext/standard/var.c:1.204 php-src/ext/standard/var.c:1.205 --- php-src/ext/standard/var.c:1.204 Thu Aug 11 19:36:00 2005 +++ php-src/ext/standard/var.c Fri Aug 12 14:54:18 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.204 2005/08/11 23:36:00 andrei Exp $ */ +/* $Id: var.c,v 1.205 2005/08/12 18:54:18 tony2001 Exp $ */ @@ -156,7 +156,6 @@ if (hash_key->type == IS_STRING) { php_printf("\""); PHPWRITE(prop_name, strlen(prop_name)); - php_printf("\""); } else if (hash_key->type == IS_UNICODE) { php_printf("u"); php_var_dump_unicode((UChar*)prop_name, u_strlen((UChar*)prop_name), verbose TSRMLS_CC); @@ -170,15 +169,12 @@ if (hash_key->type == IS_STRING) { php_printf("\""); PHPWRITE(hash_key->u.string, hash_key->nKeyLength - 1); - php_printf("\""); } else if (hash_key->type == IS_UNICODE) { php_printf("u"); php_var_dump_unicode(hash_key->u.unicode, hash_key->nKeyLength-1, verbose TSRMLS_CC); } ZEND_PUTS(":public"); } -#ifdef ANDREY_0 -#endif ZEND_PUTS("\"]=>\n"); } php_var_dump(zv, level + 2, verbose TSRMLS_CC); @@ -801,7 +797,7 @@ Z_STRVAL_PP(name), Z_STRLEN_PP(name), ce->type & ZEND_INTERNAL_CLASS); if (zend_u_hash_find(Z_OBJPROP_PP(struc), Z_TYPE_PP(name), priv_name, prop_name_length, (void *) &d) == SUCCESS) { if (Z_TYPE_PP(name) == IS_UNICODE) { - php_var_serialize_unicode(buf, priv_name, prop_name_length-1); + php_var_serialize_unicode(buf, (UChar *)priv_name, prop_name_length-1); } else { php_var_serialize_string(buf, priv_name, prop_name_length-1); } @@ -814,7 +810,7 @@ Z_STRVAL_PP(name), Z_STRLEN_PP(name), ce->type & ZEND_INTERNAL_CLASS); if (zend_u_hash_find(Z_OBJPROP_PP(struc), Z_TYPE_PP(name), prot_name, prop_name_length, (void *) &d) == SUCCESS) { if (Z_TYPE_PP(name) == IS_UNICODE) { - php_var_serialize_unicode(buf, prot_name, prop_name_length-1); + php_var_serialize_unicode(buf, (UChar *)prot_name, prop_name_length-1); } else { php_var_serialize_string(buf, prot_name, prop_name_length-1); }