jani Tue Nov 6 10:52:54 2007 UTC
Modified files:
/php-src/ext/standard incomplete_class.c php_incomplete_class.h
Log:
- ws + cs
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/incomplete_class.c?r1=1.36&r2=1.37&diff_format=u
Index: php-src/ext/standard/incomplete_class.c
diff -u php-src/ext/standard/incomplete_class.c:1.36
php-src/ext/standard/incomplete_class.c:1.37
--- php-src/ext/standard/incomplete_class.c:1.36 Sat Jul 14 08:38:19 2007
+++ php-src/ext/standard/incomplete_class.c Tue Nov 6 10:52:54 2007
@@ -14,10 +14,9 @@
+----------------------------------------------------------------------+
| Author: Sascha Schumann <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- */
-
+*/
-/* $Id: incomplete_class.c,v 1.36 2007/07/14 08:38:19 tony2001 Exp $ */
+/* $Id: incomplete_class.c,v 1.37 2007/11/06 10:52:54 jani Exp $ */
#include "php.h"
#include "basic_functions.h"
@@ -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 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 @@
/* {{{ 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 @@
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 @@
retval.s = estrndup(Z_STRVAL_PP(val), Z_STRLEN_PP(val));
}
- if (nlen)
+ if (nlen) {
*nlen = Z_UNILEN_PP(val);
+ }
}
return retval;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_incomplete_class.h?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/standard/php_incomplete_class.h
diff -u php-src/ext/standard/php_incomplete_class.h:1.22
php-src/ext/standard/php_incomplete_class.h:1.23
--- php-src/ext/standard/php_incomplete_class.h:1.22 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/php_incomplete_class.h Tue Nov 6 10:52:54 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_incomplete_class.h,v 1.22 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: php_incomplete_class.h,v 1.23 2007/11/06 10:52:54 jani Exp $ */
#ifndef PHP_INCOMPLETE_CLASS_H
#define 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
