projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
TSRMLS--
[m6w6/ext-http]
/
php_http_object.c
diff --git
a/php_http_object.c
b/php_http_object.c
index 7d902eaa3c84f66b19bc169c18ac987366d8017c..e42998ea773407c830ac3cb9282a3ade55cd7081 100644
(file)
--- a/
php_http_object.c
+++ b/
php_http_object.c
@@
-12,75
+12,70
@@
#include "php_http_api.h"
#include "php_http_api.h"
-zend_object_value php_http_object_new(zend_class_entry *ce TSRMLS_DC)
+static zend_object_handlers php_http_object_handlers;
+
+zend_object *php_http_object_new(zend_class_entry *ce)
{
{
- return
php_http_object_new_ex(ce, NULL, NULL TSRMLS_CC)
;
+ return
&php_http_object_new_ex(ce, NULL)->zo
;
}
}
-
zend_object_value php_http_object_new_ex(zend_class_entry *ce, void *nothing, php_http_object_t **ptr TSRMLS_DC
)
+
php_http_object_t *php_http_object_new_ex(zend_class_entry *ce, void *intern
)
{
php_http_object_t *o;
{
php_http_object_t *o;
- o = ecalloc(1, sizeof(
php_http_object_t
));
- zend_object_std_init(
(zend_object *) o, ce TSRMLS_CC
);
- object_properties_init(
(zend_object *)
o, ce);
+ o = ecalloc(1, sizeof(
*o) + zend_object_properties_size(ce
));
+ zend_object_std_init(
&o->zo, ce
);
+ object_properties_init(
&o->z
o, ce);
- if (ptr) {
- *ptr = o;
- }
+ o->intern = intern;
+ o->zo.handlers = &php_http_object_handlers;
-
o->zv.handle = zend_objects_store_put(o, NULL, (zend_objects_free_object_storage_t) zend_objects_free_object_storage, NULL TSRMLS_CC)
;
- o->zv.handlers = zend_get_std_object_handlers();
+
return o
;
+}
- return o->zv;
+void php_http_object_free(zend_object *object)
+{
+ zend_object_std_dtor(object);
}
}
-
STATUS php_http_new(zend_object_value *ovp, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC
)
+
ZEND_RESULT_CODE php_http_new(void **obj_ptr, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr
)
{
{
-
zend_object_value ov
;
+
void *obj
;
if (!ce) {
ce = parent_ce;
if (!ce) {
ce = parent_ce;
- } else if (parent_ce && !instanceof_function(ce, parent_ce
TSRMLS_CC
)) {
- php_http_throw(unexpected_val, "Class %s does not extend %s", ce->name
, parent_ce->name
);
+ } else if (parent_ce && !instanceof_function(ce, parent_ce)) {
+ php_http_throw(unexpected_val, "Class %s does not extend %s", ce->name
->val, parent_ce->name->val
);
return FAILURE;
}
return FAILURE;
}
- o
v = create(ce, intern_ptr, obj_ptr TSRMLS_CC
);
- if (o
vp
) {
- *o
vp = ov
;
+ o
bj = create(ce, intern_ptr
);
+ if (o
bj_ptr
) {
+ *o
bj_ptr = obj
;
}
return SUCCESS;
}
}
return SUCCESS;
}
-php_http_object_method_t *php_http_object_method_init(php_http_object_method_t *cb, zval *zobject, const char *method_str, size_t method_len
TSRMLS_DC
)
+php_http_object_method_t *php_http_object_method_init(php_http_object_method_t *cb, zval *zobject, const char *method_str, size_t method_len)
{
{
- zval *zfn;
-
if (!cb) {
cb = ecalloc(1, sizeof(*cb));
} else {
memset(cb, 0, sizeof(*cb));
}
if (!cb) {
cb = ecalloc(1, sizeof(*cb));
} else {
memset(cb, 0, sizeof(*cb));
}
- MAKE_STD_ZVAL(zfn);
- ZVAL_STRINGL(zfn, method_str, method_len, 1);
-
cb->fci.size = sizeof(cb->fci);
cb->fci.size = sizeof(cb->fci);
-
cb->fci.function_name = zfn
;
+
ZVAL_STRINGL(&cb->fci.function_name, method_str, method_len)
;
cb->fcc.initialized = 1;
cb->fcc.calling_scope = cb->fcc.called_scope = Z_OBJCE_P(zobject);
cb->fcc.initialized = 1;
cb->fcc.calling_scope = cb->fcc.called_scope = Z_OBJCE_P(zobject);
- cb->fcc.function_handler = Z_OBJ_HT_P(zobject)->get_method(&
zobject, Z_STRVAL_P(cb->fci.function_name), Z_STRLEN_P(cb->fci.function_name), NULL TSRMLS_CC
);
+ cb->fcc.function_handler = Z_OBJ_HT_P(zobject)->get_method(&
Z_OBJ_P(zobject), Z_STR(cb->fci.function_name), NULL
);
return cb;
}
void php_http_object_method_dtor(php_http_object_method_t *cb)
{
return cb;
}
void php_http_object_method_dtor(php_http_object_method_t *cb)
{
- if (cb->fci.function_name) {
- zval_ptr_dtor(&cb->fci.function_name);
- cb->fci.function_name = NULL;
- }
+ zval_ptr_dtor(&cb->fci.function_name);
}
void php_http_object_method_free(php_http_object_method_t **cb)
}
void php_http_object_method_free(php_http_object_method_t **cb)
@@
-92,35
+87,44
@@
void php_http_object_method_free(php_http_object_method_t **cb)
}
}
}
}
-
STATUS php_http_object_method_call(php_http_object_method_t *cb, zval *zobject, zval **retval_ptr, int argc, zval ***args TSRMLS_DC
)
+
ZEND_RESULT_CODE php_http_object_method_call(php_http_object_method_t *cb, zval *zobject, zval *retval_ptr, int argc, zval *args
)
{
{
-
STATUS
rv;
- zval
*retval = NULL
;
+
ZEND_RESULT_CODE
rv;
+ zval
retval
;
+ ZVAL_UNDEF(&retval);
Z_ADDREF_P(zobject);
Z_ADDREF_P(zobject);
- cb->fci.object
_ptr = zobject
;
- cb->fcc.object
_ptr = zobject
;
+ cb->fci.object
= Z_OBJ_P(zobject)
;
+ cb->fcc.object
= Z_OBJ_P(zobject)
;
- cb->fci.retval
_ptr_ptr
= retval_ptr ? retval_ptr : &retval;
+ cb->fci.retval = retval_ptr ? retval_ptr : &retval;
cb->fci.param_count = argc;
cb->fci.params = args;
if (cb->fcc.called_scope != Z_OBJCE_P(zobject)) {
cb->fcc.called_scope = Z_OBJCE_P(zobject);
cb->fci.param_count = argc;
cb->fci.params = args;
if (cb->fcc.called_scope != Z_OBJCE_P(zobject)) {
cb->fcc.called_scope = Z_OBJCE_P(zobject);
- cb->fcc.function_handler = Z_OBJ_HT_P(zobject)->get_method(&
zobject, Z_STRVAL_P(cb->fci.function_name), Z_STRLEN_P(cb->fci.function_name), NULL TSRMLS_CC
);
+ cb->fcc.function_handler = Z_OBJ_HT_P(zobject)->get_method(&
Z_OBJ_P(zobject), Z_STR(cb->fci.function_name), NULL
);
}
}
- rv = zend_call_function(&cb->fci, &cb->fcc
TSRMLS_CC
);
+ rv = zend_call_function(&cb->fci, &cb->fcc);
- zval_ptr_dtor(
&
zobject);
- if (!retval_ptr &&
retval
) {
+ zval_ptr_dtor(zobject);
+ if (!retval_ptr &&
!Z_ISUNDEF(retval)
) {
zval_ptr_dtor(&retval);
}
return rv;
}
zval_ptr_dtor(&retval);
}
return rv;
}
+PHP_MINIT_FUNCTION(http_object)
+{
+ memcpy(&php_http_object_handlers, zend_get_std_object_handlers(), sizeof(php_http_object_handlers));
+ php_http_object_handlers.offset = XtOffsetOf(php_http_object_t, zo);
+
+ return SUCCESS;
+}
+
/*
* Local variables:
* tab-width: 4
/*
* Local variables:
* tab-width: 4