jani Tue Nov 6 10:53:01 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard incomplete_class.c php_incomplete_class.h
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/incomplete_class.c?r1=1.28.2.2.2.2&r2=1.28.2.2.2.2.2.1&diff_format=u
Index: php-src/ext/standard/incomplete_class.c
diff -u php-src/ext/standard/incomplete_class.c:1.28.2.2.2.2
php-src/ext/standard/incomplete_class.c:1.28.2.2.2.2.2.1
--- php-src/ext/standard/incomplete_class.c:1.28.2.2.2.2 Thu Feb 1
14:07:43 2007
+++ php-src/ext/standard/incomplete_class.c Tue Nov 6 10:53:01 2007
@@ -14,10 +14,9 @@
+----------------------------------------------------------------------+
| Author: Sascha Schumann <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- */
-
+*/
-/* $Id: incomplete_class.c,v 1.28.2.2.2.2 2007/02/01 14:07:43 tony2001 Exp $ */
+/* $Id: incomplete_class.c,v 1.28.2.2.2.2.2.1 2007/11/06 10:53:01 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
@@ -56,46 +54,55 @@
}
/* }}} */
-static zval *incomplete_class_get_property(zval *object, zval *member, int
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);
}
}
+/* }}} */
-static void incomplete_class_write_property(zval *object, zval *member, zval
*value TSRMLS_DC)
+static void incomplete_class_write_property(zval *object, zval *member, zval
*value TSRMLS_DC) /* {{{ */
{
incomplete_class_message(object, E_NOTICE TSRMLS_CC);
}
+/* }}} */
-static zval **incomplete_class_get_property_ptr_ptr(zval *object, zval *member
TSRMLS_DC)
+static zval **incomplete_class_get_property_ptr_ptr(zval *object, zval *member
TSRMLS_DC) /* {{{ */
{
incomplete_class_message(object, E_NOTICE TSRMLS_CC);
return &EG(error_zval_ptr);
}
+/* }}} */
-static void incomplete_class_unset_property(zval *object, zval *member
TSRMLS_DC)
+static void incomplete_class_unset_property(zval *object, zval *member
TSRMLS_DC) /* {{{ */
{
incomplete_class_message(object, E_NOTICE TSRMLS_CC);
}
+/* }}} */
-static int incomplete_class_has_property(zval *object, zval *member, int
check_empty TSRMLS_DC)
+static int incomplete_class_has_property(zval *object, zval *member, int
check_empty TSRMLS_DC) /* {{{ */
{
incomplete_class_message(object, E_NOTICE TSRMLS_CC);
return 0;
}
+/* }}} */
-static union _zend_function *incomplete_class_get_method(zval **object, char
*method, int method_len TSRMLS_DC) {
+static union _zend_function *incomplete_class_get_method(zval **object, char
*method, int method_len TSRMLS_DC) /* {{{ */
+{
incomplete_class_message(*object, E_ERROR TSRMLS_CC);
return NULL;
}
+/* }}} */
/* {{{ 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;
@@ -107,7 +114,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;
@@ -140,11 +147,12 @@
if (zend_hash_find(object_properties, MAGIC_MEMBER,
sizeof(MAGIC_MEMBER), (void **) &val) == SUCCESS) {
retval = estrndup(Z_STRVAL_PP(val), Z_STRLEN_PP(val));
- if (nlen)
+ if (nlen) {
*nlen = Z_STRLEN_PP(val);
+ }
}
- return (retval);
+ return retval;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_incomplete_class.h?r1=1.17.2.2.2.1&r2=1.17.2.2.2.1.2.1&diff_format=u
Index: php-src/ext/standard/php_incomplete_class.h
diff -u php-src/ext/standard/php_incomplete_class.h:1.17.2.2.2.1
php-src/ext/standard/php_incomplete_class.h:1.17.2.2.2.1.2.1
--- php-src/ext/standard/php_incomplete_class.h:1.17.2.2.2.1 Mon Jan 1
09:36:08 2007
+++ php-src/ext/standard/php_incomplete_class.h Tue Nov 6 10:53:01 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_incomplete_class.h,v 1.17.2.2.2.1 2007/01/01 09:36:08 sebastian
Exp $ */
+/* $Id: php_incomplete_class.h,v 1.17.2.2.2.1.2.1 2007/11/06 10:53:01 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 char *php_lookup_class_name(zval *object, zend_uint *nlen);
PHPAPI void php_store_class_name(zval *object, const char *name, zend_uint
len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
