cvs: php4 /ext/standard var.c /ext/wddx wddx.c

sas Wed Jun 21 11:35:54 2000 EDT Modified files: /php4/ext/wddx wddx.c /php4/ext/standard var.c Log: Revert earlier commit. Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.46 php4/ext/wddx/wddx.c:1.47 --- php4/ext/wddx/wddx.c:1.46 Wed Jun 21 11:22:22 2000 +++ php4/ext/wddx/wddx.c Wed Jun 21 11:35:53 2000 @@ -27,15 +27,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.46 2000/06/21 18:22:22 thies Exp $ */ +/* $Id: wddx.c,v 1.47 2000/06/21 18:35:53 sas Exp $ */ #include "php.h" #include "php_wddx.h" #if HAVE_WDDX -#include "ext/standard/php_var.h" /* for php_create_empty_class */ - #include "php_wddx_api.h" #define PHP_XML_INTERNAL #include "ext/xml/php_xml.h" @@ -741,13 +739,8 @@ if (zend_hash_find(EG(class_table), ent1->data->value.str.val, ent1->data->value.str.len+1, (void **) &ce)==FAILURE) { - - ce = php_create_empty_class(ent1->data->value.str.val,ent1->data->value.str.len); - - /* php_error(E_NOTICE, "Deserializing non-existant class: %s! No methods will be available!", ent1->data->value.str.val); ce = &zend_standard_class_def; - */ } /* Initialize target object */ Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.66 php4/ext/standard/var.c:1.67 --- php4/ext/standard/var.c:1.66 Wed Jun 21 11:22:22 2000 +++ php4/ext/standard/var.c Wed Jun 21 11:35:54 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.66 2000/06/21 18:22:22 thies Exp $ */ +/* $Id: var.c,v 1.67 2000/06/21 18:35:54 sas Exp $ */ /* {{{ includes @@ -33,30 +33,6 @@ #define COMMON ((*struc)->is_ref?"&":"") /* }}} */ - -PHPAPI zend_class_entry *php_create_empty_class(char *class_name,int len) -{ - zend_class_entry nclass,*nclassp; - - CLS_FETCH(); - - memset(&nclass,0,sizeof(zend_class_entry)); - - nclass.name = estrdup(class_name); - nclass.name_length = len; - nclass.type = ZEND_USER_CLASS; - nclass.refcount = (int *) emalloc(sizeof(int)); - *nclass.refcount = 1; - nclass.constants_updated = 0; - - zend_hash_init(&nclass.function_table, 10, NULL, ZEND_FUNCTION_DTOR, 0); - zend_hash_init(&nclass.default_properties, 10, NULL, ZVAL_PTR_DTOR, 0); - - zend_hash_update(CG(class_table), nclass.name, nclass.name_length + 1, &nclass, sizeof(zend_class_entry), (void **) &nclassp); - - return nclassp; -} - /* {{{ php_var_dump */ static int php_array_element_dump(zval **zv, int num_args, va_list args, zend_hash_key *hash_key) @@ -475,11 +451,8 @@ (*p) += i; if (zend_hash_find(EG(class_table), class_name, i+1, (void **) &ce)==FAILURE) { - ce = php_create_empty_class(class_name,i); - /* php_error(E_NOTICE, "Unserializing non-existant class: %s! No methods will be available!", class_name); ce = &zend_standard_class_def; - */ } efree(class_name);