]> granicus.if.org Git - php/commitdiff
- ws + cs
authorJani Taskinen <jani@php.net>
Tue, 6 Nov 2007 10:52:54 +0000 (10:52 +0000)
committerJani Taskinen <jani@php.net>
Tue, 6 Nov 2007 10:52:54 +0000 (10:52 +0000)
ext/standard/incomplete_class.c
ext/standard/php_incomplete_class.h

index acd11c007ad7ebc5f0f499747210106ed37633a3..65c31a7bc9ba5788b7d2583dcdaa85efa40269b1 100644 (file)
@@ -14,8 +14,7 @@
    +----------------------------------------------------------------------+
    | Author:  Sascha Schumann <sascha@schumann.cx>                        |
    +----------------------------------------------------------------------+
- */
-
+*/
 
 /* $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;
index 338b01408374577cb921de6ea4b8ddedc0384194..3cbe5e3fd3a9c089789da63212030b2a72af2f63 100644 (file)
@@ -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);