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

andi Sun Jul 29 04:14:00 2001 EDT Modified files: /php4/ext/standard dir.c var.c Log: - More object macros Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.72 php4/ext/standard/dir.c:1.73 --- php4/ext/standard/dir.c:1.72 Sat Jul 28 07:36:15 2001 +++ php4/ext/standard/dir.c Sun Jul 29 04:14:00 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.72 2001/07/28 11:36:15 zeev Exp $ */ +/* $Id: dir.c,v 1.73 2001/07/29 08:14:00 andi Exp $ */ /* {{{ includes/startup/misc */ @@ -65,13 +65,13 @@ if (ZEND_NUM_ARGS() == 0) { \ myself = getThis(); \ if (myself) { \ - if (zend_hash_find(myself->value.obj.properties, "handle", sizeof("handle"), (void **)&tmp) == FAILURE) { \ + if (zend_hash_find(Z_OBJPROP_P(myself), "handle", sizeof("handle"), (void **)&tmp) == FAILURE) { \ php_error(E_WARNING, "unable to find my handle property"); \ RETURN_FALSE; \ } \ - ZEND_FETCH_RESOURCE(dirp,php_dir *,tmp,-1, "Directory", le_dirp); \ + ZEND_FETCH_RESOURCE(dirp, php_dir *, tmp, -1, "Directory", le_dirp); \ } else { \ - ZEND_FETCH_RESOURCE(dirp,php_dir *,0,DIRG(default_dir), "Directory", le_dirp); \ + ZEND_FETCH_RESOURCE(dirp, php_dir *, 0, DIRG(default_dir), "Directory", le_dirp); \ } \ } else if ((ZEND_NUM_ARGS() != 1) || zend_get_parameters_ex(1, &id) == FAILURE) { \ WRONG_PARAM_COUNT; \ Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.98 php4/ext/standard/var.c:1.99 --- php4/ext/standard/var.c:1.98 Sat Jul 28 07:36:19 2001 +++ php4/ext/standard/var.c Sun Jul 29 04:14:00 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.98 2001/07/28 11:36:19 zeev Exp $ */ +/* $Id: var.c,v 1.99 2001/07/29 08:14:00 andi Exp $ */ /* {{{ includes @@ -87,8 +87,8 @@ php_printf("%sarray(%d) {\n", COMMON, zend_hash_num_elements(myht)); goto head_done; case IS_OBJECT: - myht = HASH_OF(*struc); - php_printf("%sobject(%s)(%d) {\n", COMMON, (*struc)->value.obj.ce->name, zend_hash_num_elements(myht)); + myht = Z_OBJPROP_PP(struc); + php_printf("%sobject(%s)(%d) {\n", COMMON, Z_OBJCE_PP(struc)->name, zend_hash_num_elements(myht)); head_done: zend_hash_apply_with_arguments(myht, (apply_func_args_t) php_array_element_dump, 1, level); if (level>1) { @@ -229,7 +229,6 @@ *p = 0; } return; - case IS_OBJECT: { zval *retval_ptr = NULL; zval *fname; @@ -269,7 +268,7 @@ continue; } - if (zend_hash_find((*struc)->value.obj.properties,Z_STRVAL_PP(name),Z_STRLEN_PP(name)+1,(void*)&d) == SUCCESS) { + if (zend_hash_find(Z_OBJPROP_PP(struc), Z_STRVAL_PP(name), Z_STRLEN_PP(name)+1, (void*)&d) == SUCCESS) { php_var_serialize(buf, name, NULL); php_var_serialize(buf,d,var_hash); } @@ -295,7 +294,6 @@ } return; } - case IS_ARRAY: std_array: myht = HASH_OF(*struc); @@ -344,7 +342,6 @@ } STR_CAT(buf, "}", 1); return; - default: STR_CAT(buf, "i:0;", 4); return; @@ -521,8 +518,9 @@ ce = &zend_standard_class_def; } - object_init_ex(*rval,ce); - myht = (*rval)->value.obj.properties; + /* OBJECTS_FIXME */ + object_init_ex(*rval, ce); + myht = Z_OBJPROP_PP(rval); if (incomplete_class) php_store_class_name(*rval, class_name, name_len);