Deleted Added
full compact
zend_API.h (a0fe8e5a) zend_API.h (1e752ce9)
1/*
2 +----------------------------------------------------------------------+
3 | Zend Engine |
4 +----------------------------------------------------------------------+
5 | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
6 +----------------------------------------------------------------------+
7 | This source file is subject to version 2.00 of the Zend license, |
8 | that is bundled with this package in the file LICENSE, and is |

--- 29 unchanged lines hidden (view full) ---

38 const struct _zend_arg_info *arg_info;
39 zend_uint num_args;
40 zend_uint flags;
41} zend_function_entry;
42
43typedef struct _zend_fcall_info {
44 size_t size;
45 HashTable *function_table;
1/*
2 +----------------------------------------------------------------------+
3 | Zend Engine |
4 +----------------------------------------------------------------------+
5 | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
6 +----------------------------------------------------------------------+
7 | This source file is subject to version 2.00 of the Zend license, |
8 | that is bundled with this package in the file LICENSE, and is |

--- 29 unchanged lines hidden (view full) ---

38 const struct _zend_arg_info *arg_info;
39 zend_uint num_args;
40 zend_uint flags;
41} zend_function_entry;
42
43typedef struct _zend_fcall_info {
44 size_t size;
45 HashTable *function_table;
46 zval function_name;
46 zval *function_name;
47 HashTable *symbol_table;
47 HashTable *symbol_table;
48 zval *retval;
48 zval **retval_ptr_ptr;
49 zend_uint param_count;
49 zend_uint param_count;
50 zval *params;
50 zval ***params;
51 zval *object_ptr;
52 zend_bool no_separation;
53} zend_fcall_info;
54
55typedef struct _zend_fcall_info_cache {
56 zend_bool initialized;
57 zend_function *function_handler;
58 zend_class_entry *calling_scope;

--- 106 unchanged lines hidden (view full) ---

165#define INIT_CLASS_ENTRY(class_container, class_name, functions) \
166 INIT_OVERLOADED_CLASS_ENTRY(class_container, class_name, functions, NULL, NULL, NULL)
167
168#define INIT_CLASS_ENTRY_EX(class_container, class_name, class_name_len, functions) \
169 INIT_OVERLOADED_CLASS_ENTRY_EX(class_container, class_name, class_name_len, functions, NULL, NULL, NULL, NULL, NULL)
170
171#define INIT_OVERLOADED_CLASS_ENTRY_EX(class_container, class_name, class_name_len, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
172 { \
51 zval *object_ptr;
52 zend_bool no_separation;
53} zend_fcall_info;
54
55typedef struct _zend_fcall_info_cache {
56 zend_bool initialized;
57 zend_function *function_handler;
58 zend_class_entry *calling_scope;

--- 106 unchanged lines hidden (view full) ---

165#define INIT_CLASS_ENTRY(class_container, class_name, functions) \
166 INIT_OVERLOADED_CLASS_ENTRY(class_container, class_name, functions, NULL, NULL, NULL)
167
168#define INIT_CLASS_ENTRY_EX(class_container, class_name, class_name_len, functions) \
169 INIT_OVERLOADED_CLASS_ENTRY_EX(class_container, class_name, class_name_len, functions, NULL, NULL, NULL, NULL, NULL)
170
171#define INIT_OVERLOADED_CLASS_ENTRY_EX(class_container, class_name, class_name_len, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
172 { \
173 zend_string *cl_name; \
174 cl_name = STR_INIT(class_name, class_name_len, 1); \
175 class_container.name = zend_new_interned_string(cl_name TSRMLS_CC); \
173 const char *cl_name = class_name; \
174 int _len = class_name_len; \
175 class_container.name = zend_new_interned_string(cl_name, _len+1, 0 TSRMLS_CC); \
176 if (class_container.name == cl_name) { \
177 class_container.name = zend_strndup(cl_name, _len); \
178 } \
179 class_container.name_length = _len; \
176 INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
177 }
178
179#define INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
180 { \
181 class_container.constructor = NULL; \
182 class_container.destructor = NULL; \
183 class_container.clone = NULL; \

--- 4 unchanged lines hidden (view full) ---

188 class_container.get_static_method = NULL; \
189 class_container.__call = handle_fcall; \
190 class_container.__callstatic = NULL; \
191 class_container.__tostring = NULL; \
192 class_container.__get = handle_propget; \
193 class_container.__set = handle_propset; \
194 class_container.__unset = handle_propunset; \
195 class_container.__isset = handle_propisset; \
180 INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
181 }
182
183#define INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
184 { \
185 class_container.constructor = NULL; \
186 class_container.destructor = NULL; \
187 class_container.clone = NULL; \

--- 4 unchanged lines hidden (view full) ---

192 class_container.get_static_method = NULL; \
193 class_container.__call = handle_fcall; \
194 class_container.__callstatic = NULL; \
195 class_container.__tostring = NULL; \
196 class_container.__get = handle_propget; \
197 class_container.__set = handle_propset; \
198 class_container.__unset = handle_propunset; \
199 class_container.__isset = handle_propisset; \
200 class_container.__debugInfo = NULL; \
196 class_container.serialize_func = NULL; \
197 class_container.unserialize_func = NULL; \
198 class_container.serialize = NULL; \
199 class_container.unserialize = NULL; \
200 class_container.parent = NULL; \
201 class_container.num_interfaces = 0; \
202 class_container.traits = NULL; \
203 class_container.num_traits = 0; \

--- 23 unchanged lines hidden (view full) ---

227#endif
228
229#define ZEND_FCI_INITIALIZED(fci) ((fci).size != 0)
230
231int zend_next_free_module(void);
232
233BEGIN_EXTERN_C()
234ZEND_API int zend_get_parameters(int ht, int param_count, ...);
201 class_container.serialize_func = NULL; \
202 class_container.unserialize_func = NULL; \
203 class_container.serialize = NULL; \
204 class_container.unserialize = NULL; \
205 class_container.parent = NULL; \
206 class_container.num_interfaces = 0; \
207 class_container.traits = NULL; \
208 class_container.num_traits = 0; \

--- 23 unchanged lines hidden (view full) ---

232#endif
233
234#define ZEND_FCI_INITIALIZED(fci) ((fci).size != 0)
235
236int zend_next_free_module(void);
237
238BEGIN_EXTERN_C()
239ZEND_API int zend_get_parameters(int ht, int param_count, ...);
235ZEND_API int _zend_get_parameters_array(int ht, int param_count, zval *argument_array TSRMLS_DC);
240ZEND_API int _zend_get_parameters_array(int ht, int param_count, zval **argument_array TSRMLS_DC);
236ZEND_API ZEND_ATTRIBUTE_DEPRECATED int zend_get_parameters_ex(int param_count, ...);
241ZEND_API ZEND_ATTRIBUTE_DEPRECATED int zend_get_parameters_ex(int param_count, ...);
237ZEND_API int _zend_get_parameters_array_ex(int param_count, zval *argument_array TSRMLS_DC);
242ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_array TSRMLS_DC);
238
239/* internal function to efficiently copy parameters when executing __call() */
240ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array TSRMLS_DC);
241
242#define zend_get_parameters_array(ht, param_count, argument_array) \
243 _zend_get_parameters_array(ht, param_count, argument_array TSRMLS_CC)
244#define zend_get_parameters_array_ex(param_count, argument_array) \
245 _zend_get_parameters_array_ex(param_count, argument_array TSRMLS_CC)

--- 5 unchanged lines hidden (view full) ---

251#define ZEND_PARSE_PARAMS_QUIET 1<<1
252ZEND_API int zend_parse_parameters(int num_args TSRMLS_DC, const char *type_spec, ...);
253ZEND_API int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, const char *type_spec, ...);
254ZEND_API char *zend_zval_type_name(const zval *arg);
255
256ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr, const char *type_spec, ...);
257ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, zval *this_ptr, const char *type_spec, ...);
258
243
244/* internal function to efficiently copy parameters when executing __call() */
245ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array TSRMLS_DC);
246
247#define zend_get_parameters_array(ht, param_count, argument_array) \
248 _zend_get_parameters_array(ht, param_count, argument_array TSRMLS_CC)
249#define zend_get_parameters_array_ex(param_count, argument_array) \
250 _zend_get_parameters_array_ex(param_count, argument_array TSRMLS_CC)

--- 5 unchanged lines hidden (view full) ---

256#define ZEND_PARSE_PARAMS_QUIET 1<<1
257ZEND_API int zend_parse_parameters(int num_args TSRMLS_DC, const char *type_spec, ...);
258ZEND_API int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, const char *type_spec, ...);
259ZEND_API char *zend_zval_type_name(const zval *arg);
260
261ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr, const char *type_spec, ...);
262ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, zval *this_ptr, const char *type_spec, ...);
263
259ZEND_API int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval *arg, const char *spec, ...);
264ZEND_API int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval **arg, const char *spec, ...);
260
261/* End of parameter parsing API -- andrei */
262
263ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC);
264ZEND_API void zend_unregister_functions(const zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC);
265
266/* End of parameter parsing API -- andrei */
267
268ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC);
269ZEND_API void zend_unregister_functions(const zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC);
265ZEND_API int zend_startup_module(zend_module_entry *module_entry TSRMLS_DC);
270ZEND_API int zend_startup_module(zend_module_entry *module_entry);
266ZEND_API zend_module_entry* zend_register_internal_module(zend_module_entry *module_entry TSRMLS_DC);
267ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module TSRMLS_DC);
268ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC);
269ZEND_API int zend_startup_modules(TSRMLS_D);
270ZEND_API void zend_collect_module_handlers(TSRMLS_D);
271ZEND_API void zend_destroy_modules(void);
272ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce, const zend_function *fptr, int error_type TSRMLS_DC);
273
274ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry TSRMLS_DC);
271ZEND_API zend_module_entry* zend_register_internal_module(zend_module_entry *module_entry TSRMLS_DC);
272ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module TSRMLS_DC);
273ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC);
274ZEND_API int zend_startup_modules(TSRMLS_D);
275ZEND_API void zend_collect_module_handlers(TSRMLS_D);
276ZEND_API void zend_destroy_modules(void);
277ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce, const zend_function *fptr, int error_type TSRMLS_DC);
278
279ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry TSRMLS_DC);
275ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce TSRMLS_DC);
280ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce, char *parent_name TSRMLS_DC);
276ZEND_API zend_class_entry *zend_register_internal_interface(zend_class_entry *orig_class_entry TSRMLS_DC);
277ZEND_API void zend_class_implements(zend_class_entry *class_entry TSRMLS_DC, int num_interfaces, ...);
278
279ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC);
280
281#define zend_register_class_alias(name, ce) \
282 zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_CC)
283#define zend_register_ns_class_alias(ns, name, ce) \

--- 11 unchanged lines hidden (view full) ---

295
296#define IS_CALLABLE_STRICT (IS_CALLABLE_CHECK_IS_STATIC)
297
298ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint check_flags, char **callable_name, int *callable_name_len, zend_fcall_info_cache *fcc, char **error TSRMLS_DC);
299ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char **callable_name TSRMLS_DC);
300ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRMLS_DC);
301ZEND_API const char *zend_get_module_version(const char *module_name);
302ZEND_API int zend_get_module_started(const char *module_name);
281ZEND_API zend_class_entry *zend_register_internal_interface(zend_class_entry *orig_class_entry TSRMLS_DC);
282ZEND_API void zend_class_implements(zend_class_entry *class_entry TSRMLS_DC, int num_interfaces, ...);
283
284ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC);
285
286#define zend_register_class_alias(name, ce) \
287 zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_CC)
288#define zend_register_ns_class_alias(ns, name, ce) \

--- 11 unchanged lines hidden (view full) ---

300
301#define IS_CALLABLE_STRICT (IS_CALLABLE_CHECK_IS_STATIC)
302
303ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint check_flags, char **callable_name, int *callable_name_len, zend_fcall_info_cache *fcc, char **error TSRMLS_DC);
304ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char **callable_name TSRMLS_DC);
305ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRMLS_DC);
306ZEND_API const char *zend_get_module_version(const char *module_name);
307ZEND_API int zend_get_module_started(const char *module_name);
303ZEND_API int zend_declare_property_ex(zend_class_entry *ce, zend_string *name, zval *property, int access_type, zend_string *doc_comment TSRMLS_DC);
304ZEND_API int zend_declare_property(zend_class_entry *ce, const char *name, int name_length, zval *property, int access_type TSRMLS_DC);
308ZEND_API int zend_declare_property(zend_class_entry *ce, const char *name, int name_length, zval *property, int access_type TSRMLS_DC);
309ZEND_API int zend_declare_property_ex(zend_class_entry *ce, const char *name, int name_length, zval *property, int access_type, const char *doc_comment, int doc_comment_len TSRMLS_DC);
305ZEND_API int zend_declare_property_null(zend_class_entry *ce, const char *name, int name_length, int access_type TSRMLS_DC);
306ZEND_API int zend_declare_property_bool(zend_class_entry *ce, const char *name, int name_length, long value, int access_type TSRMLS_DC);
307ZEND_API int zend_declare_property_long(zend_class_entry *ce, const char *name, int name_length, long value, int access_type TSRMLS_DC);
308ZEND_API int zend_declare_property_double(zend_class_entry *ce, const char *name, int name_length, double value, int access_type TSRMLS_DC);
309ZEND_API int zend_declare_property_string(zend_class_entry *ce, const char *name, int name_length, const char *value, int access_type TSRMLS_DC);
310ZEND_API int zend_declare_property_stringl(zend_class_entry *ce, const char *name, int name_length, const char *value, int value_len, int access_type TSRMLS_DC);
311
312ZEND_API int zend_declare_class_constant(zend_class_entry *ce, const char *name, size_t name_length, zval *value TSRMLS_DC);

--- 21 unchanged lines hidden (view full) ---

334ZEND_API int zend_update_static_property_string(zend_class_entry *scope, const char *name, int name_length, const char *value TSRMLS_DC);
335ZEND_API int zend_update_static_property_stringl(zend_class_entry *scope, const char *name, int name_length, const char *value, int value_length TSRMLS_DC);
336
337ZEND_API zval *zend_read_property(zend_class_entry *scope, zval *object, const char *name, int name_length, zend_bool silent TSRMLS_DC);
338
339ZEND_API zval *zend_read_static_property(zend_class_entry *scope, const char *name, int name_length, zend_bool silent TSRMLS_DC);
340
341ZEND_API zend_class_entry *zend_get_class_entry(const zval *zobject TSRMLS_DC);
310ZEND_API int zend_declare_property_null(zend_class_entry *ce, const char *name, int name_length, int access_type TSRMLS_DC);
311ZEND_API int zend_declare_property_bool(zend_class_entry *ce, const char *name, int name_length, long value, int access_type TSRMLS_DC);
312ZEND_API int zend_declare_property_long(zend_class_entry *ce, const char *name, int name_length, long value, int access_type TSRMLS_DC);
313ZEND_API int zend_declare_property_double(zend_class_entry *ce, const char *name, int name_length, double value, int access_type TSRMLS_DC);
314ZEND_API int zend_declare_property_string(zend_class_entry *ce, const char *name, int name_length, const char *value, int access_type TSRMLS_DC);
315ZEND_API int zend_declare_property_stringl(zend_class_entry *ce, const char *name, int name_length, const char *value, int value_len, int access_type TSRMLS_DC);
316
317ZEND_API int zend_declare_class_constant(zend_class_entry *ce, const char *name, size_t name_length, zval *value TSRMLS_DC);

--- 21 unchanged lines hidden (view full) ---

339ZEND_API int zend_update_static_property_string(zend_class_entry *scope, const char *name, int name_length, const char *value TSRMLS_DC);
340ZEND_API int zend_update_static_property_stringl(zend_class_entry *scope, const char *name, int name_length, const char *value, int value_length TSRMLS_DC);
341
342ZEND_API zval *zend_read_property(zend_class_entry *scope, zval *object, const char *name, int name_length, zend_bool silent TSRMLS_DC);
343
344ZEND_API zval *zend_read_static_property(zend_class_entry *scope, const char *name, int name_length, zend_bool silent TSRMLS_DC);
345
346ZEND_API zend_class_entry *zend_get_class_entry(const zval *zobject TSRMLS_DC);
342ZEND_API zend_string *zend_get_object_classname(const zval *object TSRMLS_DC);
347ZEND_API int zend_get_object_classname(const zval *object, const char **class_name, zend_uint *class_name_len TSRMLS_DC);
343ZEND_API char *zend_get_type_by_const(int type);
344
345#define getThis() (this_ptr)
346
347#define WRONG_PARAM_COUNT ZEND_WRONG_PARAM_COUNT()
348#define WRONG_PARAM_COUNT_WITH_RETVAL(ret) ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)
348ZEND_API char *zend_get_type_by_const(int type);
349
350#define getThis() (this_ptr)
351
352#define WRONG_PARAM_COUNT ZEND_WRONG_PARAM_COUNT()
353#define WRONG_PARAM_COUNT_WITH_RETVAL(ret) ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)
349#define ARG_COUNT(dummy) (param_count)
350#define ZEND_NUM_ARGS() (param_count)
354#define ARG_COUNT(dummy) (ht)
355#define ZEND_NUM_ARGS() (ht)
351#define ZEND_WRONG_PARAM_COUNT() { zend_wrong_param_count(TSRMLS_C); return; }
352#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret) { zend_wrong_param_count(TSRMLS_C); return ret; }
353
354#ifndef ZEND_WIN32
355#define DLEXPORT
356#endif
357
358#define array_init(arg) _array_init((arg), 0 ZEND_FILE_LINE_CC)

--- 10 unchanged lines hidden (view full) ---

369ZEND_API void zend_merge_properties(zval *obj, HashTable *properties, int destroy_ht TSRMLS_DC);
370
371/* no longer supported */
372ZEND_API int add_assoc_function(zval *arg, const char *key, void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS));
373
374ZEND_API int add_assoc_long_ex(zval *arg, const char *key, uint key_len, long n);
375ZEND_API int add_assoc_null_ex(zval *arg, const char *key, uint key_len);
376ZEND_API int add_assoc_bool_ex(zval *arg, const char *key, uint key_len, int b);
356#define ZEND_WRONG_PARAM_COUNT() { zend_wrong_param_count(TSRMLS_C); return; }
357#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret) { zend_wrong_param_count(TSRMLS_C); return ret; }
358
359#ifndef ZEND_WIN32
360#define DLEXPORT
361#endif
362
363#define array_init(arg) _array_init((arg), 0 ZEND_FILE_LINE_CC)

--- 10 unchanged lines hidden (view full) ---

374ZEND_API void zend_merge_properties(zval *obj, HashTable *properties, int destroy_ht TSRMLS_DC);
375
376/* no longer supported */
377ZEND_API int add_assoc_function(zval *arg, const char *key, void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS));
378
379ZEND_API int add_assoc_long_ex(zval *arg, const char *key, uint key_len, long n);
380ZEND_API int add_assoc_null_ex(zval *arg, const char *key, uint key_len);
381ZEND_API int add_assoc_bool_ex(zval *arg, const char *key, uint key_len, int b);
377ZEND_API int add_assoc_resource_ex(zval *arg, const char *key, uint key_len, zend_resource *r);
382ZEND_API int add_assoc_resource_ex(zval *arg, const char *key, uint key_len, int r);
378ZEND_API int add_assoc_double_ex(zval *arg, const char *key, uint key_len, double d);
383ZEND_API int add_assoc_double_ex(zval *arg, const char *key, uint key_len, double d);
379ZEND_API int add_assoc_str_ex(zval *arg, const char *key, uint key_len, zend_string *str);
380ZEND_API int add_assoc_string_ex(zval *arg, const char *key, uint key_len, char *str, int duplicate);
381ZEND_API int add_assoc_stringl_ex(zval *arg, const char *key, uint key_len, char *str, uint length, int duplicate);
382ZEND_API int add_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value);
383
384ZEND_API int add_assoc_string_ex(zval *arg, const char *key, uint key_len, char *str, int duplicate);
385ZEND_API int add_assoc_stringl_ex(zval *arg, const char *key, uint key_len, char *str, uint length, int duplicate);
386ZEND_API int add_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value);
387
384#define add_assoc_long(__arg, __key, __n) add_assoc_long_ex(__arg, __key, strlen(__key), __n)
385#define add_assoc_null(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key))
386#define add_assoc_bool(__arg, __key, __b) add_assoc_bool_ex(__arg, __key, strlen(__key), __b)
387#define add_assoc_resource(__arg, __key, __r) add_assoc_resource_ex(__arg, __key, strlen(__key), __r)
388#define add_assoc_double(__arg, __key, __d) add_assoc_double_ex(__arg, __key, strlen(__key), __d)
389#define add_assoc_str(__arg, __key, __str) add_assoc_str_ex(__arg, __key, strlen(__key), __str)
390#define add_assoc_string(__arg, __key, __str, __duplicate) add_assoc_string_ex(__arg, __key, strlen(__key), __str, __duplicate)
391#define add_assoc_stringl(__arg, __key, __str, __length, __duplicate) add_assoc_stringl_ex(__arg, __key, strlen(__key), __str, __length, __duplicate)
392#define add_assoc_zval(__arg, __key, __value) add_assoc_zval_ex(__arg, __key, strlen(__key), __value)
388#define add_assoc_long(__arg, __key, __n) add_assoc_long_ex(__arg, __key, strlen(__key)+1, __n)
389#define add_assoc_null(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1)
390#define add_assoc_bool(__arg, __key, __b) add_assoc_bool_ex(__arg, __key, strlen(__key)+1, __b)
391#define add_assoc_resource(__arg, __key, __r) add_assoc_resource_ex(__arg, __key, strlen(__key)+1, __r)
392#define add_assoc_double(__arg, __key, __d) add_assoc_double_ex(__arg, __key, strlen(__key)+1, __d)
393#define add_assoc_string(__arg, __key, __str, __duplicate) add_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate)
394#define add_assoc_stringl(__arg, __key, __str, __length, __duplicate) add_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate)
395#define add_assoc_zval(__arg, __key, __value) add_assoc_zval_ex(__arg, __key, strlen(__key)+1, __value)
393
394/* unset() functions are only suported for legacy modules and null() functions should be used */
396
397/* unset() functions are only suported for legacy modules and null() functions should be used */
395#define add_assoc_unset(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key))
398#define add_assoc_unset(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1)
396#define add_index_unset(__arg, __key) add_index_null(__arg, __key)
397#define add_next_index_unset(__arg) add_next_index_null(__arg)
398#define add_property_unset(__arg, __key) add_property_null(__arg, __key)
399
400ZEND_API int add_index_long(zval *arg, ulong idx, long n);
401ZEND_API int add_index_null(zval *arg, ulong idx);
402ZEND_API int add_index_bool(zval *arg, ulong idx, int b);
399#define add_index_unset(__arg, __key) add_index_null(__arg, __key)
400#define add_next_index_unset(__arg) add_next_index_null(__arg)
401#define add_property_unset(__arg, __key) add_property_null(__arg, __key)
402
403ZEND_API int add_index_long(zval *arg, ulong idx, long n);
404ZEND_API int add_index_null(zval *arg, ulong idx);
405ZEND_API int add_index_bool(zval *arg, ulong idx, int b);
403ZEND_API int add_index_resource(zval *arg, ulong idx, zend_resource *r);
406ZEND_API int add_index_resource(zval *arg, ulong idx, int r);
404ZEND_API int add_index_double(zval *arg, ulong idx, double d);
407ZEND_API int add_index_double(zval *arg, ulong idx, double d);
405ZEND_API int add_index_str(zval *arg, ulong idx, zend_string *str);
406ZEND_API int add_index_string(zval *arg, ulong idx, const char *str, int duplicate);
407ZEND_API int add_index_stringl(zval *arg, ulong idx, const char *str, uint length, int duplicate);
408ZEND_API int add_index_zval(zval *arg, ulong index, zval *value);
409
410ZEND_API int add_next_index_long(zval *arg, long n);
411ZEND_API int add_next_index_null(zval *arg);
412ZEND_API int add_next_index_bool(zval *arg, int b);
408ZEND_API int add_index_string(zval *arg, ulong idx, const char *str, int duplicate);
409ZEND_API int add_index_stringl(zval *arg, ulong idx, const char *str, uint length, int duplicate);
410ZEND_API int add_index_zval(zval *arg, ulong index, zval *value);
411
412ZEND_API int add_next_index_long(zval *arg, long n);
413ZEND_API int add_next_index_null(zval *arg);
414ZEND_API int add_next_index_bool(zval *arg, int b);
413ZEND_API int add_next_index_resource(zval *arg, zend_resource *r);
415ZEND_API int add_next_index_resource(zval *arg, int r);
414ZEND_API int add_next_index_double(zval *arg, double d);
416ZEND_API int add_next_index_double(zval *arg, double d);
415ZEND_API int add_next_index_str(zval *arg, zend_string *str);
416ZEND_API int add_next_index_string(zval *arg, const char *str, int duplicate);
417ZEND_API int add_next_index_stringl(zval *arg, const char *str, uint length, int duplicate);
418ZEND_API int add_next_index_zval(zval *arg, zval *value);
419
417ZEND_API int add_next_index_string(zval *arg, const char *str, int duplicate);
418ZEND_API int add_next_index_stringl(zval *arg, const char *str, uint length, int duplicate);
419ZEND_API int add_next_index_zval(zval *arg, zval *value);
420
420ZEND_API zval *add_get_assoc_string_ex(zval *arg, const char *key, uint key_len, const char *str, int duplicate);
421ZEND_API zval *add_get_assoc_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, uint length, int duplicate);
421ZEND_API int add_get_assoc_string_ex(zval *arg, const char *key, uint key_len, const char *str, void **dest, int duplicate);
422ZEND_API int add_get_assoc_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, uint length, void **dest, int duplicate);
422
423
423#define add_get_assoc_string(__arg, __key, __str, __duplicate) add_get_assoc_string_ex(__arg, __key, strlen(__key), __str, __duplicate)
424#define add_get_assoc_stringl(__arg, __key, __str, __length, __duplicate) add_get_assoc_stringl_ex(__arg, __key, strlen(__key), __str, __length, __duplicate)
424#define add_get_assoc_string(__arg, __key, __str, __dest, __duplicate) add_get_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __dest, __duplicate)
425#define add_get_assoc_stringl(__arg, __key, __str, __length, __dest, __duplicate) add_get_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __dest, __duplicate)
425
426
426ZEND_API zval *add_get_index_long(zval *arg, ulong idx, long l);
427ZEND_API zval *add_get_index_double(zval *arg, ulong idx, double d);
428ZEND_API zval *add_get_index_str(zval *arg, ulong index, zend_string *str);
429ZEND_API zval *add_get_index_string(zval *arg, ulong idx, const char *str, int duplicate);
430ZEND_API zval *add_get_index_stringl(zval *arg, ulong idx, const char *str, uint length, int duplicate);
427ZEND_API int add_get_index_long(zval *arg, ulong idx, long l, void **dest);
428ZEND_API int add_get_index_double(zval *arg, ulong idx, double d, void **dest);
429ZEND_API int add_get_index_string(zval *arg, ulong idx, const char *str, void **dest, int duplicate);
430ZEND_API int add_get_index_stringl(zval *arg, ulong idx, const char *str, uint length, void **dest, int duplicate);
431
432ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value);
433
434ZEND_API int add_property_long_ex(zval *arg, const char *key, uint key_len, long l TSRMLS_DC);
435ZEND_API int add_property_null_ex(zval *arg, const char *key, uint key_len TSRMLS_DC);
436ZEND_API int add_property_bool_ex(zval *arg, const char *key, uint key_len, int b TSRMLS_DC);
431
432ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value);
433
434ZEND_API int add_property_long_ex(zval *arg, const char *key, uint key_len, long l TSRMLS_DC);
435ZEND_API int add_property_null_ex(zval *arg, const char *key, uint key_len TSRMLS_DC);
436ZEND_API int add_property_bool_ex(zval *arg, const char *key, uint key_len, int b TSRMLS_DC);
437ZEND_API int add_property_resource_ex(zval *arg, const char *key, uint key_len, zend_resource *r TSRMLS_DC);
437ZEND_API int add_property_resource_ex(zval *arg, const char *key, uint key_len, long r TSRMLS_DC);
438ZEND_API int add_property_double_ex(zval *arg, const char *key, uint key_len, double d TSRMLS_DC);
439ZEND_API int add_property_string_ex(zval *arg, const char *key, uint key_len, const char *str, int duplicate TSRMLS_DC);
440ZEND_API int add_property_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, uint length, int duplicate TSRMLS_DC);
441ZEND_API int add_property_zval_ex(zval *arg, const char *key, uint key_len, zval *value TSRMLS_DC);
442
438ZEND_API int add_property_double_ex(zval *arg, const char *key, uint key_len, double d TSRMLS_DC);
439ZEND_API int add_property_string_ex(zval *arg, const char *key, uint key_len, const char *str, int duplicate TSRMLS_DC);
440ZEND_API int add_property_stringl_ex(zval *arg, const char *key, uint key_len, const char *str, uint length, int duplicate TSRMLS_DC);
441ZEND_API int add_property_zval_ex(zval *arg, const char *key, uint key_len, zval *value TSRMLS_DC);
442
443#define add_property_long(__arg, __key, __n) add_property_long_ex(__arg, __key, strlen(__key), __n TSRMLS_CC)
444#define add_property_null(__arg, __key) add_property_null_ex(__arg, __key, strlen(__key) TSRMLS_CC)
445#define add_property_bool(__arg, __key, __b) add_property_bool_ex(__arg, __key, strlen(__key), __b TSRMLS_CC)
446#define add_property_resource(__arg, __key, __r) add_property_resource_ex(__arg, __key, strlen(__key), __r TSRMLS_CC)
447#define add_property_double(__arg, __key, __d) add_property_double_ex(__arg, __key, strlen(__key), __d TSRMLS_CC)
448#define add_property_string(__arg, __key, __str, __duplicate) add_property_string_ex(__arg, __key, strlen(__key), __str, __duplicate TSRMLS_CC)
449#define add_property_stringl(__arg, __key, __str, __length, __duplicate) add_property_stringl_ex(__arg, __key, strlen(__key), __str, __length, __duplicate TSRMLS_CC)
450#define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, strlen(__key), __value TSRMLS_CC)
443#define add_property_long(__arg, __key, __n) add_property_long_ex(__arg, __key, strlen(__key)+1, __n TSRMLS_CC)
444#define add_property_null(__arg, __key) add_property_null_ex(__arg, __key, strlen(__key) + 1 TSRMLS_CC)
445#define add_property_bool(__arg, __key, __b) add_property_bool_ex(__arg, __key, strlen(__key)+1, __b TSRMLS_CC)
446#define add_property_resource(__arg, __key, __r) add_property_resource_ex(__arg, __key, strlen(__key)+1, __r TSRMLS_CC)
447#define add_property_double(__arg, __key, __d) add_property_double_ex(__arg, __key, strlen(__key)+1, __d TSRMLS_CC)
448#define add_property_string(__arg, __key, __str, __duplicate) add_property_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate TSRMLS_CC)
449#define add_property_stringl(__arg, __key, __str, __length, __duplicate) add_property_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate TSRMLS_CC)
450#define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, strlen(__key)+1, __value TSRMLS_CC)
451
452
451
452
453ZEND_API int call_user_function(HashTable *function_table, zval *object, zval *function_name, zval *retval_ptr, zend_uint param_count, zval params[] TSRMLS_DC);
454ZEND_API int call_user_function_ex(HashTable *function_table, zval *object, zval *function_name, zval *retval_ptr, zend_uint param_count, zval params[], int no_separation, HashTable *symbol_table TSRMLS_DC);
453ZEND_API int call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, zend_uint param_count, zval *params[] TSRMLS_DC);
454ZEND_API int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, zend_uint param_count, zval **params[], int no_separation, HashTable *symbol_table TSRMLS_DC);
455
456ZEND_API extern const zend_fcall_info empty_fcall_info;
457ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache;
458
459/** Build zend_call_info/cache from a zval*
460 *
461 * Caller is responsible to provide a return value, otherwise the we will crash.
462 * fci->retval_ptr_ptr = NULL;

--- 8 unchanged lines hidden (view full) ---

471/** Clear arguments connected with zend_fcall_info *fci
472 * If free_mem is not zero then the params array gets free'd as well
473 */
474ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem);
475
476/** Save current arguments from zend_fcall_info *fci
477 * params array will be set to NULL
478 */
455
456ZEND_API extern const zend_fcall_info empty_fcall_info;
457ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache;
458
459/** Build zend_call_info/cache from a zval*
460 *
461 * Caller is responsible to provide a return value, otherwise the we will crash.
462 * fci->retval_ptr_ptr = NULL;

--- 8 unchanged lines hidden (view full) ---

471/** Clear arguments connected with zend_fcall_info *fci
472 * If free_mem is not zero then the params array gets free'd as well
473 */
474ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem);
475
476/** Save current arguments from zend_fcall_info *fci
477 * params array will be set to NULL
478 */
479ZEND_API void zend_fcall_info_args_save(zend_fcall_info *fci, int *param_count, zval **params);
479ZEND_API void zend_fcall_info_args_save(zend_fcall_info *fci, int *param_count, zval ****params);
480
481/** Free arguments connected with zend_fcall_info *fci andset back saved ones.
482 */
480
481/** Free arguments connected with zend_fcall_info *fci andset back saved ones.
482 */
483ZEND_API void zend_fcall_info_args_restore(zend_fcall_info *fci, int param_count, zval *params);
483ZEND_API void zend_fcall_info_args_restore(zend_fcall_info *fci, int param_count, zval ***params);
484
485/** Set or clear the arguments in the zend_call_info struct taking care of
486 * refcount. If args is NULL and arguments are set then those are cleared.
487 */
488ZEND_API int zend_fcall_info_args(zend_fcall_info *fci, zval *args TSRMLS_DC);
489
490/** Set arguments in the zend_fcall_info struct taking care of refcount.
491 * If argc is 0 the arguments which are set will be cleared, else pass
492 * a variable amount of zval** arguments.
493 */
484
485/** Set or clear the arguments in the zend_call_info struct taking care of
486 * refcount. If args is NULL and arguments are set then those are cleared.
487 */
488ZEND_API int zend_fcall_info_args(zend_fcall_info *fci, zval *args TSRMLS_DC);
489
490/** Set arguments in the zend_fcall_info struct taking care of refcount.
491 * If argc is 0 the arguments which are set will be cleared, else pass
492 * a variable amount of zval** arguments.
493 */
494ZEND_API int zend_fcall_info_argp(zend_fcall_info *fci TSRMLS_DC, int argc, zval *argv);
494ZEND_API int zend_fcall_info_argp(zend_fcall_info *fci TSRMLS_DC, int argc, zval ***argv);
495
496/** Set arguments in the zend_fcall_info struct taking care of refcount.
497 * If argc is 0 the arguments which are set will be cleared, else pass
498 * a variable amount of zval** arguments.
499 */
500ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_list *argv);
501
502/** Set arguments in the zend_fcall_info struct taking care of refcount.
503 * If argc is 0 the arguments which are set will be cleared, else pass
504 * a variable amount of zval** arguments.
505 */
506ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...);
507
508/** Call a function using information created by zend_fcall_info_init()/args().
509 * If args is given then those replace the argument info in fci is temporarily.
510 */
495
496/** Set arguments in the zend_fcall_info struct taking care of refcount.
497 * If argc is 0 the arguments which are set will be cleared, else pass
498 * a variable amount of zval** arguments.
499 */
500ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_list *argv);
501
502/** Set arguments in the zend_fcall_info struct taking care of refcount.
503 * If argc is 0 the arguments which are set will be cleared, else pass
504 * a variable amount of zval** arguments.
505 */
506ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...);
507
508/** Call a function using information created by zend_fcall_info_init()/args().
509 * If args is given then those replace the argument info in fci is temporarily.
510 */
511ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval *retval, zval *args TSRMLS_DC);
511ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval, zval *args TSRMLS_DC);
512
513ZEND_API int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TSRMLS_DC);
514
515ZEND_API int zend_set_hash_symbol(zval *symbol, const char *name, int name_length, zend_bool is_ref, int num_symbol_tables, ...);
516
512
513ZEND_API int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TSRMLS_DC);
514
515ZEND_API int zend_set_hash_symbol(zval *symbol, const char *name, int name_length, zend_bool is_ref, int num_symbol_tables, ...);
516
517ZEND_API void zend_delete_variable(zend_execute_data *ex, HashTable *ht, zend_string *name TSRMLS_DC);
517ZEND_API void zend_delete_variable(zend_execute_data *ex, HashTable *ht, const char *name, int name_len, ulong hash_value TSRMLS_DC);
518
518
519ZEND_API int zend_delete_global_variable(zend_string *name TSRMLS_DC);
519ZEND_API int zend_delete_global_variable(const char *name, int name_len TSRMLS_DC);
520
520
521ZEND_API int zend_delete_global_variable_ex(const char *name, int name_len, ulong hash_value TSRMLS_DC);
522
521ZEND_API void zend_reset_all_cv(HashTable *symbol_table TSRMLS_DC);
522
523ZEND_API void zend_rebuild_symbol_table(TSRMLS_D);
524
523ZEND_API void zend_reset_all_cv(HashTable *symbol_table TSRMLS_DC);
524
525ZEND_API void zend_rebuild_symbol_table(TSRMLS_D);
526
525ZEND_API zend_string *zend_find_alias_name(zend_class_entry *ce, zend_string *name);
526ZEND_API zend_string *zend_resolve_method_name(zend_class_entry *ce, zend_function *f);
527ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name, zend_uint len);
528ZEND_API const char* zend_resolve_method_name(zend_class_entry *ce, zend_function *f);
527
528#define add_method(arg, key, method) add_assoc_function((arg), (key), (method))
529
530ZEND_API ZEND_FUNCTION(display_disabled_function);
531ZEND_API ZEND_FUNCTION(display_disabled_class);
532END_EXTERN_C()
533
534#if ZEND_DEBUG

--- 4 unchanged lines hidden (view full) ---

539#else
540#define CHECK_ZVAL_STRING(z)
541#define CHECK_ZVAL_STRING_REL(z)
542#endif
543
544#define CHECK_ZVAL_NULL_PATH(p) (Z_STRLEN_P(p) != strlen(Z_STRVAL_P(p)))
545#define CHECK_NULL_PATH(p, l) (strlen(p) != l)
546
529
530#define add_method(arg, key, method) add_assoc_function((arg), (key), (method))
531
532ZEND_API ZEND_FUNCTION(display_disabled_function);
533ZEND_API ZEND_FUNCTION(display_disabled_class);
534END_EXTERN_C()
535
536#if ZEND_DEBUG

--- 4 unchanged lines hidden (view full) ---

541#else
542#define CHECK_ZVAL_STRING(z)
543#define CHECK_ZVAL_STRING_REL(z)
544#endif
545
546#define CHECK_ZVAL_NULL_PATH(p) (Z_STRLEN_P(p) != strlen(Z_STRVAL_P(p)))
547#define CHECK_NULL_PATH(p, l) (strlen(p) != l)
548
547#define ZVAL_STRINGL(z, s, l) do { \
548 ZVAL_STR(z, STR_INIT(s, l, 0)); \
549#define ZVAL_RESOURCE(z, l) do { \
550 zval *__z = (z); \
551 Z_LVAL_P(__z) = l; \
552 Z_TYPE_P(__z) = IS_RESOURCE;\
549 } while (0)
550
553 } while (0)
554
551#define ZVAL_STRING(z, s) do { \
552 const char *_s = (s); \
553 ZVAL_STRINGL(z, _s, strlen(_s)); \
555#define ZVAL_BOOL(z, b) do { \
556 zval *__z = (z); \
557 Z_LVAL_P(__z) = ((b) != 0); \
558 Z_TYPE_P(__z) = IS_BOOL; \
554 } while (0)
555
559 } while (0)
560
556#define ZVAL_EMPTY_STRING(z) do { \
557 ZVAL_STRINGL(z, "", 0); \
558 } while (0)
561#define ZVAL_NULL(z) { \
562 Z_TYPE_P(z) = IS_NULL; \
563 }
559
564
560#define ZVAL_PSTRINGL(z, s, l) do { \
561 ZVAL_STR(z, STR_INIT(s, l, 1)); \
565#define ZVAL_LONG(z, l) { \
566 zval *__z = (z); \
567 Z_LVAL_P(__z) = l; \
568 Z_TYPE_P(__z) = IS_LONG; \
569 }
570
571#define ZVAL_DOUBLE(z, d) { \
572 zval *__z = (z); \
573 Z_DVAL_P(__z) = d; \
574 Z_TYPE_P(__z) = IS_DOUBLE; \
575 }
576
577#define ZVAL_STRING(z, s, duplicate) do { \
578 const char *__s=(s); \
579 zval *__z = (z); \
580 Z_STRLEN_P(__z) = strlen(__s); \
581 Z_STRVAL_P(__z) = (duplicate?estrndup(__s, Z_STRLEN_P(__z)):(char*)__s);\
582 Z_TYPE_P(__z) = IS_STRING; \
562 } while (0)
563
583 } while (0)
584
564#define ZVAL_PSTRING(z, s) do { \
565 const char *_s = (s); \
566 ZVAL_PSTRINGL(z, _s, strlen(_s)); \
585#define ZVAL_STRINGL(z, s, l, duplicate) do { \
586 const char *__s=(s); int __l=l; \
587 zval *__z = (z); \
588 Z_STRLEN_P(__z) = __l; \
589 Z_STRVAL_P(__z) = (duplicate?estrndup(__s, __l):(char*)__s);\
590 Z_TYPE_P(__z) = IS_STRING; \
567 } while (0)
568
591 } while (0)
592
569#define ZVAL_EMPTY_PSTRING(z) do { \
570 ZVAL_PSTRINGL(z, "", 0); \
593#define ZVAL_EMPTY_STRING(z) do { \
594 zval *__z = (z); \
595 Z_STRLEN_P(__z) = 0; \
596 Z_STRVAL_P(__z) = STR_EMPTY_ALLOC();\
597 Z_TYPE_P(__z) = IS_STRING; \
571 } while (0)
572
573#define ZVAL_ZVAL(z, zv, copy, dtor) do { \
574 zval *__z = (z); \
575 zval *__zv = (zv); \
576 ZVAL_COPY_VALUE(__z, __zv); \
577 if (copy) { \
578 zval_copy_ctor(__z); \
579 } \
580 if (dtor) { \
581 if (!copy) { \
582 ZVAL_NULL(__zv); \
583 } \
598 } while (0)
599
600#define ZVAL_ZVAL(z, zv, copy, dtor) do { \
601 zval *__z = (z); \
602 zval *__zv = (zv); \
603 ZVAL_COPY_VALUE(__z, __zv); \
604 if (copy) { \
605 zval_copy_ctor(__z); \
606 } \
607 if (dtor) { \
608 if (!copy) { \
609 ZVAL_NULL(__zv); \
610 } \
584 zval_ptr_dtor(__zv); \
611 zval_ptr_dtor(&__zv); \
585 } \
586 } while (0)
587
588#define ZVAL_FALSE(z) ZVAL_BOOL(z, 0)
589#define ZVAL_TRUE(z) ZVAL_BOOL(z, 1)
590
612 } \
613 } while (0)
614
615#define ZVAL_FALSE(z) ZVAL_BOOL(z, 0)
616#define ZVAL_TRUE(z) ZVAL_BOOL(z, 1)
617
618#define RETVAL_RESOURCE(l) ZVAL_RESOURCE(return_value, l)
591#define RETVAL_BOOL(b) ZVAL_BOOL(return_value, b)
592#define RETVAL_NULL() ZVAL_NULL(return_value)
593#define RETVAL_LONG(l) ZVAL_LONG(return_value, l)
594#define RETVAL_DOUBLE(d) ZVAL_DOUBLE(return_value, d)
619#define RETVAL_BOOL(b) ZVAL_BOOL(return_value, b)
620#define RETVAL_NULL() ZVAL_NULL(return_value)
621#define RETVAL_LONG(l) ZVAL_LONG(return_value, l)
622#define RETVAL_DOUBLE(d) ZVAL_DOUBLE(return_value, d)
595#define RETVAL_STR(s) ZVAL_STR(return_value, s)
596#define RETVAL_STRING(s) ZVAL_STRING(return_value, s)
597#define RETVAL_STRINGL(s, l) ZVAL_STRINGL(return_value, s, l)
623#define RETVAL_STRING(s, duplicate) ZVAL_STRING(return_value, s, duplicate)
624#define RETVAL_STRINGL(s, l, duplicate) ZVAL_STRINGL(return_value, s, l, duplicate)
598#define RETVAL_EMPTY_STRING() ZVAL_EMPTY_STRING(return_value)
625#define RETVAL_EMPTY_STRING() ZVAL_EMPTY_STRING(return_value)
599#define RETVAL_RES(r) ZVAL_RES(return_value, r)
600#define RETVAL_ZVAL(zv, copy, dtor) ZVAL_ZVAL(return_value, zv, copy, dtor)
601#define RETVAL_FALSE ZVAL_BOOL(return_value, 0)
602#define RETVAL_TRUE ZVAL_BOOL(return_value, 1)
603
626#define RETVAL_ZVAL(zv, copy, dtor) ZVAL_ZVAL(return_value, zv, copy, dtor)
627#define RETVAL_FALSE ZVAL_BOOL(return_value, 0)
628#define RETVAL_TRUE ZVAL_BOOL(return_value, 1)
629
630#define RETURN_RESOURCE(l) { RETVAL_RESOURCE(l); return; }
604#define RETURN_BOOL(b) { RETVAL_BOOL(b); return; }
605#define RETURN_NULL() { RETVAL_NULL(); return;}
606#define RETURN_LONG(l) { RETVAL_LONG(l); return; }
607#define RETURN_DOUBLE(d) { RETVAL_DOUBLE(d); return; }
631#define RETURN_BOOL(b) { RETVAL_BOOL(b); return; }
632#define RETURN_NULL() { RETVAL_NULL(); return;}
633#define RETURN_LONG(l) { RETVAL_LONG(l); return; }
634#define RETURN_DOUBLE(d) { RETVAL_DOUBLE(d); return; }
608#define RETURN_STR(s) { RETVAL_STR(s); return; }
609#define RETURN_STRING(s) { RETVAL_STRING(s); return; }
610#define RETURN_STRINGL(s, l) { RETVAL_STRINGL(s, l); return; }
635#define RETURN_STRING(s, duplicate) { RETVAL_STRING(s, duplicate); return; }
636#define RETURN_STRINGL(s, l, duplicate) { RETVAL_STRINGL(s, l, duplicate); return; }
611#define RETURN_EMPTY_STRING() { RETVAL_EMPTY_STRING(); return; }
637#define RETURN_EMPTY_STRING() { RETVAL_EMPTY_STRING(); return; }
612#define RETURN_RES(r) { RETVAL_RES(r); return; }
613#define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; }
614#define RETURN_FALSE { RETVAL_FALSE; return; }
615#define RETURN_TRUE { RETVAL_TRUE; return; }
616
617#define RETVAL_ZVAL_FAST(z) do { \
618 zval *_z = (z); \
619 if (Z_ISREF_P(_z)) { \
620 RETVAL_ZVAL(_z, 1, 0); \
621 } else { \
638#define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; }
639#define RETURN_FALSE { RETVAL_FALSE; return; }
640#define RETURN_TRUE { RETVAL_TRUE; return; }
641
642#define RETVAL_ZVAL_FAST(z) do { \
643 zval *_z = (z); \
644 if (Z_ISREF_P(_z)) { \
645 RETVAL_ZVAL(_z, 1, 0); \
646 } else { \
622 zval_ptr_dtor(return_value); \
623 ZVAL_COPY(return_value, _z); \
647 zval_ptr_dtor(&return_value); \
648 Z_ADDREF_P(_z); \
649 *return_value_ptr = _z; \
624 } \
625} while (0)
650 } \
651} while (0)
626
627#define RETURN_ZVAL_FAST(z) { RETVAL_ZVAL_FAST(z); return; }
628
629#define SET_VAR_STRING(n, v) { \
630 { \
631 zval *var; \
632 ALLOC_ZVAL(var); \
633 ZVAL_STRING(var, v, 0); \
634 ZEND_SET_GLOBAL_VAR(n, var); \

--- 27 unchanged lines hidden (view full) ---

662 } \
663 }
664
665
666#define ZEND_SET_SYMBOL(symtable, name, var) \
667 { \
668 char *_name = (name); \
669 \
652#define RETURN_ZVAL_FAST(z) { RETVAL_ZVAL_FAST(z); return; }
653
654#define SET_VAR_STRING(n, v) { \
655 { \
656 zval *var; \
657 ALLOC_ZVAL(var); \
658 ZVAL_STRING(var, v, 0); \
659 ZEND_SET_GLOBAL_VAR(n, var); \

--- 27 unchanged lines hidden (view full) ---

687 } \
688 }
689
690
691#define ZEND_SET_SYMBOL(symtable, name, var) \
692 { \
693 char *_name = (name); \
694 \
670 ZEND_SET_SYMBOL_WITH_LENGTH(symtable, _name, strlen(_name), var, 1, 0); \
695 ZEND_SET_SYMBOL_WITH_LENGTH(symtable, _name, strlen(_name)+1, var, 1, 0); \
671 }
672
673#define ZEND_SET_SYMBOL_WITH_LENGTH(symtable, name, name_length, var, _refcount, _is_ref) \
674 { \
696 }
697
698#define ZEND_SET_SYMBOL_WITH_LENGTH(symtable, name, name_length, var, _refcount, _is_ref) \
699 { \
675 zval *orig_var; \
700 zval **orig_var; \
676 \
701 \
677 if ((orig_var = zend_hash_str_find(symtable, (name), (name_length))) != NULL \
678 && Z_ISREF_P(orig_var)) { \
679 Z_SET_REFCOUNT_P(var, Z_REFCOUNT_P(orig_var)); \
680 /*???Z_SET_ISREF_P(var);*/ \
702 if (zend_hash_find(symtable, (name), (name_length), (void **) &orig_var)==SUCCESS \
703 && PZVAL_IS_REF(*orig_var)) { \
704 Z_SET_REFCOUNT_P(var, Z_REFCOUNT_PP(orig_var)); \
705 Z_SET_ISREF_P(var); \
681 \
682 if (_refcount) { \
683 Z_SET_REFCOUNT_P(var, Z_REFCOUNT_P(var) + _refcount - 1); \
684 } \
706 \
707 if (_refcount) { \
708 Z_SET_REFCOUNT_P(var, Z_REFCOUNT_P(var) + _refcount - 1); \
709 } \
685 zval_dtor(orig_var); \
686 ZVAL_COPY_VALUE(orig_var, var); \
687 /*???FREE_ZVAL(var);*/ \
710 zval_dtor(*orig_var); \
711 **orig_var = *(var); \
712 FREE_ZVAL(var); \
688 } else { \
713 } else { \
689 /*???Z_SET_ISREF_TO_P(var, _is_ref);*/ \
714 Z_SET_ISREF_TO_P(var, _is_ref); \
690 if (_refcount) { \
691 Z_SET_REFCOUNT_P(var, _refcount); \
692 } \
715 if (_refcount) { \
716 Z_SET_REFCOUNT_P(var, _refcount); \
717 } \
693 zend_hash_str_update(symtable, (name), (name_length), var); \
718 zend_hash_update(symtable, (name), (name_length), &(var), sizeof(zval *), NULL); \
694 } \
695 }
696
697
698#define ZEND_SET_GLOBAL_VAR(name, var) \
699 ZEND_SET_SYMBOL(&EG(symbol_table), name, var)
700
701#define ZEND_SET_GLOBAL_VAR_WITH_LENGTH(name, name_length, var, _refcount, _is_ref) \
702 ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), name, name_length, var, _refcount, _is_ref)
703
704#define ZEND_DEFINE_PROPERTY(class_ptr, name, value, mask) \
705{ \
706 char *_name = (name); \
707 int namelen = strlen(_name); \
708 zend_declare_property(class_ptr, _name, namelen, value, mask TSRMLS_CC); \
709}
710
711#define HASH_OF(p) (Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties((p) TSRMLS_CC) : NULL)))
719 } \
720 }
721
722
723#define ZEND_SET_GLOBAL_VAR(name, var) \
724 ZEND_SET_SYMBOL(&EG(symbol_table), name, var)
725
726#define ZEND_SET_GLOBAL_VAR_WITH_LENGTH(name, name_length, var, _refcount, _is_ref) \
727 ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), name, name_length, var, _refcount, _is_ref)
728
729#define ZEND_DEFINE_PROPERTY(class_ptr, name, value, mask) \
730{ \
731 char *_name = (name); \
732 int namelen = strlen(_name); \
733 zend_declare_property(class_ptr, _name, namelen, value, mask TSRMLS_CC); \
734}
735
736#define HASH_OF(p) (Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties((p) TSRMLS_CC) : NULL)))
712#define ZVAL_IS_NULL(z) (Z_TYPE_P(z) == IS_NULL)
713#define ZVAL_IS_UNDEF(z) (Z_TYPE_P(z) == IS_UNDEF)
737#define ZVAL_IS_NULL(z) (Z_TYPE_P(z)==IS_NULL)
714
715/* For compatibility */
716#define ZEND_MINIT ZEND_MODULE_STARTUP_N
717#define ZEND_MSHUTDOWN ZEND_MODULE_SHUTDOWN_N
718#define ZEND_RINIT ZEND_MODULE_ACTIVATE_N
719#define ZEND_RSHUTDOWN ZEND_MODULE_DEACTIVATE_N
720#define ZEND_MINFO ZEND_MODULE_INFO_N
721#define ZEND_GINIT(module) ((void (*)(void* TSRMLS_DC))(ZEND_MODULE_GLOBALS_CTOR_N(module)))

--- 22 unchanged lines hidden ---
738
739/* For compatibility */
740#define ZEND_MINIT ZEND_MODULE_STARTUP_N
741#define ZEND_MSHUTDOWN ZEND_MODULE_SHUTDOWN_N
742#define ZEND_RINIT ZEND_MODULE_ACTIVATE_N
743#define ZEND_RSHUTDOWN ZEND_MODULE_DEACTIVATE_N
744#define ZEND_MINFO ZEND_MODULE_INFO_N
745#define ZEND_GINIT(module) ((void (*)(void* TSRMLS_DC))(ZEND_MODULE_GLOBALS_CTOR_N(module)))

--- 22 unchanged lines hidden ---