diff options
| author | Sascha Schumann <sas@php.net> | 2000-06-21 18:35:54 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-06-21 18:35:54 +0000 |
| commit | 9d640cc990e212238f6e86955e0198926c086e8c (patch) | |
| tree | 9112abd457b263d29dbccf41a587443adcfe5ea9 /ext | |
| parent | bc8d0782ddd9cd18349a97b89784627f85b61f13 (diff) | |
| download | php-git-9d640cc990e212238f6e86955e0198926c086e8c.tar.gz | |
Revert earlier commit.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/var.c | 27 | ||||
| -rw-r--r-- | ext/wddx/wddx.c | 7 |
2 files changed, 0 insertions, 34 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c index 7506890722..6c32f13d0f 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -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 @@ int php_var_unserialize(pval **rval, const char **p, const char *max) (*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); diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 0bd5cfa7c8..01ec184c85 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -34,8 +34,6 @@ #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 @@ static void php_wddx_pop_element(void *user_data, const char *name) 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 */ |