From: Jani Taskinen Date: Tue, 6 Nov 2007 10:52:54 +0000 (+0000) Subject: - ws + cs X-Git-Tag: RELEASE_2_0_0a1~1446 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22e53ef3b201d0d0e63d75d49551c0bd932e6374;p=php - ws + cs --- diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c index acd11c007a..65c31a7bc9 100644 --- a/ext/standard/incomplete_class.c +++ b/ext/standard/incomplete_class.c @@ -14,8 +14,7 @@ +----------------------------------------------------------------------+ | Author: Sascha Schumann | +----------------------------------------------------------------------+ - */ - +*/ /* $Id$ */ @@ -31,7 +30,6 @@ "unserialize() gets called or provide a __autoload() function " \ "to load the class definition " - static zend_object_handlers php_incomplete_object_handlers; /* {{{ incomplete_class_message @@ -60,7 +58,8 @@ static void incomplete_class_message(zval *object, int error_type TSRMLS_DC) static zval *incomplete_class_get_property(zval *object, zval *member, int type TSRMLS_DC) /* {{{ */ { incomplete_class_message(object, E_NOTICE TSRMLS_CC); - if(type == BP_VAR_W || type == BP_VAR_RW) { + + if (type == BP_VAR_W || type == BP_VAR_RW) { return EG(error_zval_ptr); } else { return EG(uninitialized_zval_ptr); @@ -103,7 +102,8 @@ static union _zend_function *incomplete_class_get_method(zval **object, zstr met /* {{{ php_create_incomplete_class */ -static zend_object_value php_create_incomplete_object(zend_class_entry *class_type TSRMLS_DC) { +static zend_object_value php_create_incomplete_object(zend_class_entry *class_type TSRMLS_DC) +{ zend_object *object; zend_object_value value; @@ -115,7 +115,7 @@ static zend_object_value php_create_incomplete_object(zend_class_entry *class_ty return value; } -zend_class_entry *php_create_incomplete_class(TSRMLS_D) +PHPAPI zend_class_entry *php_create_incomplete_class(TSRMLS_D) { zend_class_entry incomplete_class; @@ -152,8 +152,9 @@ PHPAPI zstr php_lookup_class_name(zval *object, zend_uint *nlen) retval.s = estrndup(Z_STRVAL_PP(val), Z_STRLEN_PP(val)); } - if (nlen) + if (nlen) { *nlen = Z_UNILEN_PP(val); + } } return retval; diff --git a/ext/standard/php_incomplete_class.h b/ext/standard/php_incomplete_class.h index 338b014083..3cbe5e3fd3 100644 --- a/ext/standard/php_incomplete_class.h +++ b/ext/standard/php_incomplete_class.h @@ -52,9 +52,8 @@ #ifdef __cplusplus extern "C" { #endif - -zend_class_entry *php_create_incomplete_class(TSRMLS_D); +PHPAPI zend_class_entry *php_create_incomplete_class(TSRMLS_D); PHPAPI zstr php_lookup_class_name(zval *object, zend_uint *nlen); PHPAPI void php_store_class_name(zval *object, zstr name, zend_uint len);