FREE_ZVAL(pzv); \
} \
INIT_PZVAL(&(zv));
+
+#define MAKE_COPY_ZVAL(ppzv, pzv) \
+ *(pzv) = **(ppzv); \
+ zval_copy_ctor((pzv)); \
+ INIT_PZVAL((pzv));
#define REPLACE_ZVAL_VALUE(ppzv_dest, pzv_src, copy) { \
int is_ref, refcount; \
) {
zval **tmp;
if (zend_hash_find(HASH_OF(options), "default", sizeof("default"), (void **)&tmp) == SUCCESS) {
- **value = **tmp;
- zval_copy_ctor(*value);
- INIT_PZVAL(*value);
+ MAKE_COPY_ZVAL(tmp, *value);
}
}
}
zval *tmp;
ALLOC_ZVAL(tmp);
- *tmp = **filtered;
- zval_copy_ctor(tmp);
- INIT_PZVAL(tmp);
+ MAKE_COPY_ZVAL(filtered, tmp);
zval_dtor(*filtered);
if (!op) {
zval_dtor(return_value);
- *return_value = *input;
- zval_copy_ctor(return_value);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(&input, return_value);
php_filter_call(&return_value, FILTER_DEFAULT, NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_PP(op) == IS_LONG) {
zval_dtor(return_value);
- *return_value = *input;
- zval_copy_ctor(return_value);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(&input, return_value);
php_filter_call(&return_value, Z_LVAL_PP(op), NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_PP(op) == IS_ARRAY) {
array_init(return_value);
zval *nval;
ALLOC_ZVAL(nval);
- *nval = **tmp;
- zval_copy_ctor(nval);
- INIT_PZVAL(nval);
+ MAKE_COPY_ZVAL(tmp, nval);
php_filter_call(&nval, -1, arg_elm, 0, FILTER_REQUIRE_SCALAR TSRMLS_CC);
add_assoc_zval_ex(return_value, arg_key, arg_key_len, nval);
Z_TYPE_PP(opt) == IS_ARRAY &&
zend_hash_find(HASH_OF(*opt), "default", sizeof("default"), (void **)&def) == SUCCESS
) {
- *return_value = **def;
- zval_copy_ctor(return_value);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(def, return_value);
return;
}
}
}
}
- *return_value = **tmp;
- zval_copy_ctor(return_value); /* Watch out for empty strings */
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(tmp, return_value);
php_filter_call(&return_value, filter, filter_args, 1, FILTER_REQUIRE_SCALAR TSRMLS_CC);
}
RETURN_FALSE;
}
- *return_value = *data;
- zval_copy_ctor(data);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(&data, return_value);
php_filter_call(&return_value, filter, filter_args, 1, FILTER_REQUIRE_SCALAR TSRMLS_CC);
}
if (!zend_is_callable(*replace, 0, &callback_name TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires argument 2, '%s', to be a valid callback", callback_name);
efree(callback_name);
- *return_value = **subject;
- zval_copy_ctor(return_value);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(subject, return_value);
return;
}
efree(callback_name);
param.param_type = PDO_PARAM_STR;
MAKE_STD_ZVAL(param.parameter);
- *param.parameter = **tmp;
- zval_copy_ctor(param.parameter);
- INIT_PZVAL(param.parameter);
+ MAKE_COPY_ZVAL(tmp, param.parameter);
if (!really_register_bound_param(¶m, stmt, 1 TSRMLS_CC)) {
if (param.parameter) {
zval_ptr_dtor(&return_value); /* we don't need that */
return_value = retval;
} else if (retval) {
- *return_value = *retval;
- zval_copy_ctor(return_value);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(&retval, return_value);
zval_ptr_dtor(&retval);
}
}
func->funcname = estrdup(func_name);
MAKE_STD_ZVAL(func->func);
- *(func->func) = *callback;
- zval_copy_ctor(func->func);
- INIT_PZVAL(func->func);
+ MAKE_COPY_ZVAL(&callback, func->func);
func->argc = argc;
func->funcname = estrdup(func_name);
MAKE_STD_ZVAL(func->step);
- *(func->step) = *step_callback;
- zval_copy_ctor(func->step);
- INIT_PZVAL(func->step);
+ MAKE_COPY_ZVAL(&step_callback, func->step);
MAKE_STD_ZVAL(func->fini);
- *(func->fini) = *fini_callback;
- zval_copy_ctor(func->fini);
- INIT_PZVAL(func->fini);
+ MAKE_COPY_ZVAL(&fini_callback, func->fini);
func->argc = argc;
RETURN_FALSE;
}
- *return_value = **value;
- zval_copy_ctor(return_value);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(value, return_value);
}
#ifdef ilia_0
if (!(class_name && class_name[0] != '*' && strcmp(class_name, ce->name))) {
/* copy: enforce read only access */
ALLOC_ZVAL(prop_copy);
- *prop_copy = **value;
- zval_copy_ctor(prop_copy);
- INIT_PZVAL(prop_copy);
+ MAKE_COPY_ZVAL(value, prop_copy);
add_assoc_zval(return_value, prop_name, prop_copy);
}
/* copy: enforce read only access */
ALLOC_ZVAL(prop_copy);
- *prop_copy = **prop;
- zval_copy_ctor(prop_copy);
- INIT_PZVAL(prop_copy);
+ MAKE_COPY_ZVAL(prop, prop_copy);
add_assoc_zval(return_value, prop_name, prop_copy);
}
if (zend_hash_find(&ce->constants_table, name, name_len + 1, (void **) &value) == FAILURE) {
RETURN_FALSE;
}
- *return_value = **value;
- zval_copy_ctor(return_value);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(value, return_value);
}
/* }}} */
zend_error(E_ERROR, "Internal error: Could not find the property %s::%s", intern->ce->name, ref->prop.name);
/* Bails out */
}
- *return_value= **member;
- zval_copy_ctor(return_value);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(member, return_value);
} else {
char *class_name, *prop_name;
}
zend_unmangle_property_name(ref->prop.name, ref->prop.name_length, &class_name, &prop_name);
member_p = zend_read_property(ref->ce, object, prop_name, strlen(prop_name), 1 TSRMLS_CC);
- *return_value= *member_p;
- zval_copy_ctor(return_value);
- INIT_PZVAL(return_value);
+ MAKE_COPY_ZVAL(&member_p, return_value);
if (member_p != EG(uninitialized_zval_ptr)) {
zval_add_ref(&member_p);
zval_ptr_dtor(&member_p);
service->type = SOAP_OBJECT;
MAKE_STD_ZVAL(service->soap_object);
- *service->soap_object = *obj;
- zval_copy_ctor(service->soap_object);
- INIT_PZVAL(service->soap_object);
+ MAKE_COPY_ZVAL(&obj, service->soap_object);
SOAP_SERVER_END_CODE();
}
}
fault = add_soap_fault(SOAP_GLOBAL(error_object), code, buffer, NULL, NULL TSRMLS_CC);
MAKE_STD_ZVAL(exception);
- *exception = *fault;
- zval_copy_ctor(exception);
- INIT_PZVAL(exception);
+ MAKE_COPY_ZVAL(&fault, exception);
zend_throw_exception_object(exception TSRMLS_CC);
old_objects = EG(objects_store).object_buckets;
zval *class_map;
MAKE_STD_ZVAL(class_map);
- *class_map = **tmp;
- INIT_PZVAL(class_map);
- zval_copy_ctor(class_map);
+ MAKE_COPY_ZVAL(tmp, class_map);
#ifdef ZEND_ENGINE_2
Z_DELREF_P(class_map);
#endif
zval *exception;
MAKE_STD_ZVAL(exception);
- *exception = *return_value;
- zval_copy_ctor(exception);
- INIT_PZVAL(exception);
+ MAKE_COPY_ZVAL(&return_value, exception);
zend_throw_exception_object(exception TSRMLS_CC);
}
#endif
return;
}
} else if (intern->u.caching.flags & CIT_TOSTRING_USE_CURRENT) {
- *return_value = *intern->current.data;
- zval_copy_ctor(return_value);
+ MAKE_COPY_ZVAL(&intern->current.data, return_value);
convert_to_string(return_value);
- INIT_PZVAL(return_value);
return;
}
if (intern->u.caching.zstr) {
func->func_name = estrdup(sql_func);
MAKE_STD_ZVAL(func->func);
- *(func->func) = *callback_func;
- zval_copy_ctor(func->func);
- INIT_PZVAL(func->func);
+ MAKE_COPY_ZVAL(&callback_func, func->func);
func->argc = sql_func_num_args;
func->next = db_obj->funcs;
func->func_name = estrdup(sql_func);
MAKE_STD_ZVAL(func->step);
- *(func->step) = *step_callback;
- zval_copy_ctor(func->step);
- INIT_PZVAL(func->step);
+ MAKE_COPY_ZVAL(&step_callback, func->step);
MAKE_STD_ZVAL(func->fini);
- *(func->fini) = *fini_callback;
- zval_copy_ctor(func->fini);
- INIT_PZVAL(func->fini);
+ MAKE_COPY_ZVAL(&fini_callback, func->fini);
func->argc = sql_func_num_args;
func->next = db_obj->funcs;
if (zend_hash_find(eg_active_symbol_table, Z_STRVAL_P(entry), Z_STRLEN_P(entry) + 1, (void **)&value_ptr) != FAILURE) {
value = *value_ptr;
ALLOC_ZVAL(data);
- *data = *value;
- zval_copy_ctor(data);
- INIT_PZVAL(data);
+ MAKE_COPY_ZVAL(&value, data);
zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_P(entry), Z_STRLEN_P(entry) + 1, &data, sizeof(zval *), NULL);
}
if (ZEND_NUM_ARGS() > 2) {
ALLOC_ZVAL(result);
- *result = *initial;
- zval_copy_ctor(result);
- INIT_PZVAL(result);
+ MAKE_COPY_ZVAL(&initial, result);
} else {
MAKE_STD_ZVAL(result);
ZVAL_NULL(result);
break;
}
ALLOC_ZVAL(element);
- *element = *arg2;
- zval_copy_ctor(element);
- INIT_PZVAL(element);
+ MAKE_COPY_ZVAL(&arg2, element);
zend_symtable_update(Z_ARRVAL_P(arr), Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) + 1, &element, sizeof(zval *), NULL);
break;
}
ALLOC_ZVAL(element);
- *element = *arg2;
- zval_copy_ctor(element);
- INIT_PZVAL(element);
+ MAKE_COPY_ZVAL(&arg2, element);
if (arg3 && Z_STRLEN_P(arg3) > 0) {
add_assoc_zval_ex(hash, Z_STRVAL_P(arg3), Z_STRLEN_P(arg3) + 1, element);
if (stream->wrapperdata) {
MAKE_STD_ZVAL(newval);
- *newval = *(stream->wrapperdata);
- zval_copy_ctor(newval);
- INIT_PZVAL(newval);
+ MAKE_COPY_ZVAL(&stream->wrapperdata, newval);
add_assoc_zval(return_value, "wrapper_data", newval);
}
/* If search is an array */
if (Z_TYPE_P(search) == IS_ARRAY) {
/* Duplicate subject string for repeated replacement */
- *result = **subject;
- zval_copy_ctor(result);
- INIT_PZVAL(result);
+ MAKE_COPY_ZVAL(subject, result);
zend_hash_internal_pointer_reset(Z_ARRVAL_P(search));
Z_STRVAL_P(search), Z_STRLEN_P(search),
Z_STRVAL_P(replace), Z_STRLEN_P(replace), &Z_STRLEN_P(result), case_sensitivity, replace_count);
} else {
- *result = **subject;
- zval_copy_ctor(result);
- INIT_PZVAL(result);
+ MAKE_COPY_ZVAL(subject, result);
}
}
}
#endif */
ALLOC_ZVAL(parser->object);
- *parser->object = *mythis;
- zval_copy_ctor(parser->object);
- INIT_PZVAL(parser->object);
+ MAKE_COPY_ZVAL(&mythis, parser->object);
RETVAL_TRUE;
}
}
MAKE_STD_ZVAL(val_arr);
- *val_arr = *val;
- zval_copy_ctor(val_arr);
- INIT_PZVAL(val_arr);
+ MAKE_COPY_ZVAL(&val, val_arr);
convert_to_array(val_arr);
vtype = determine_vector_type(Z_ARRVAL_P(val_arr));
projects / php / commitdiff