Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

ZTS fixes

  • Loading branch information...
commit b6825b9f65bbf98145b681127ddc68b9e0c06be2 1 parent 049d15f
@derickr authored
Showing with 10 additions and 11 deletions.
  1. +5 −5 xdebug_handler_dbgp.c
  2. +3 −4 xdebug_var.c
  3. +2 −2 xdebug_var.h
View
10 xdebug_handler_dbgp.c
@@ -599,7 +599,7 @@ static zval* get_symbol_contents_zval(char* name, int name_length TSRMLS_DC)
keyword_end = *p;
if (strncmp(keyword, "::", 2) == 0) { /* static class properties */
- zend_class_entry *ce = zend_fetch_class(XG(active_fse)->function.class, strlen(XG(active_fse)->function.class), ZEND_FETCH_CLASS_SELF);
+ zend_class_entry *ce = zend_fetch_class(XG(active_fse)->function.class, strlen(XG(active_fse)->function.class), ZEND_FETCH_CLASS_SELF TSRMLS_CC);
st = CE_STATIC_MEMBERS(ce);
current_classname = estrdup(ce->name);
@@ -634,7 +634,7 @@ static xdebug_xml_node* get_symbol(char* name, int name_length, xdebug_var_expor
retval = get_symbol_contents_zval(name, name_length TSRMLS_CC);
if (retval) {
- return xdebug_get_zval_value_xml_node(name, retval, options);
+ return xdebug_get_zval_value_xml_node(name, retval, options TSRMLS_CC);
}
return NULL;
@@ -1299,7 +1299,7 @@ DBGP_FUNC(eval)
if (res == FAILURE) {
RETURN_RESULT(XG(status), XG(reason), XDEBUG_ERROR_EVALUATING_CODE);
} else {
- ret_xml = xdebug_get_zval_value_xml_node(NULL, &ret_zval, options);
+ ret_xml = xdebug_get_zval_value_xml_node(NULL, &ret_zval, options TSRMLS_CC);
xdebug_xml_add_child(*retval, ret_xml);
zval_dtor(&ret_zval);
}
@@ -2001,9 +2001,9 @@ static int attach_context_vars(xdebug_xml_node *node, xdebug_var_export_options
* method call as we attach constants and static properties to "this"
* too normally. */
if (fse->function.type == XFUNC_STATIC_MEMBER) {
- zend_class_entry *ce = zend_fetch_class(fse->function.class, strlen(fse->function.class), ZEND_FETCH_CLASS_SELF);
+ zend_class_entry *ce = zend_fetch_class(fse->function.class, strlen(fse->function.class), ZEND_FETCH_CLASS_SELF TSRMLS_CC);
- xdebug_attach_static_vars(node, options, ce);
+ xdebug_attach_static_vars(node, options, ce TSRMLS_CC);
}
XG(active_symbol_table) = NULL;
View
7 xdebug_var.c
@@ -710,7 +710,7 @@ void xdebug_attach_static_var_with_contents(zval **zv XDEBUG_ZEND_HASH_APPLY_TSR
}
}
-int xdebug_attach_static_vars(xdebug_xml_node *node, xdebug_var_export_options *options, zend_class_entry *ce)
+int xdebug_attach_static_vars(xdebug_xml_node *node, xdebug_var_export_options *options, zend_class_entry *ce TSRMLS_DC)
{
HashTable *static_members = CE_STATIC_MEMBERS(ce);
xdebug_xml_node *static_container;
@@ -795,7 +795,7 @@ void xdebug_var_export_xml_node(zval **struc, char *name, xdebug_xml_node *node,
zend_hash_init(merged_hash, 128, NULL, NULL, 0);
zend_get_object_classname(*struc, &class_name, &class_name_len TSRMLS_CC);
- ce = zend_fetch_class(class_name, strlen(class_name), ZEND_FETCH_CLASS_DEFAULT);
+ ce = zend_fetch_class(class_name, strlen(class_name), ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC);
/* Adding static properties */
zend_hash_apply_with_arguments(ce->static_members XDEBUG_ZEND_HASH_APPLY_TSRMLS_CC, (apply_func_args_t) object_item_add_to_merged_hash, 2, merged_hash, (int) XDEBUG_OBJECT_ITEM_TYPE_STATIC_PROPERTY);
@@ -848,12 +848,11 @@ void xdebug_var_export_xml_node(zval **struc, char *name, xdebug_xml_node *node,
}
}
-xdebug_xml_node* xdebug_get_zval_value_xml_node_ex(char *name, zval *val, int var_type, xdebug_var_export_options *options)
+xdebug_xml_node* xdebug_get_zval_value_xml_node_ex(char *name, zval *val, int var_type, xdebug_var_export_options *options TSRMLS_DC)
{
xdebug_xml_node *node;
char *short_name = NULL;
char *full_name = NULL;
- TSRMLS_FETCH();
node = xdebug_xml_node_init("property");
if (name) {
View
4 xdebug_var.h
@@ -64,11 +64,11 @@ char* xdebug_get_zval_value(zval *val, int debug_zval, xdebug_var_export_options
char* xdebug_get_zval_value_xml(char *name, zval *val);
char* xdebug_get_zval_value_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC);
-int xdebug_attach_static_vars(xdebug_xml_node *node, xdebug_var_export_options *options, zend_class_entry *ce);
+int xdebug_attach_static_vars(xdebug_xml_node *node, xdebug_var_export_options *options, zend_class_entry *ce TSRMLS_DC);
void xdebug_attach_static_var_with_contents(zval **zv XDEBUG_ZEND_HASH_APPLY_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
xdebug_xml_node* xdebug_get_zval_value_xml_node(char *name, zval *val, xdebug_var_export_options *options);
#define xdebug_get_zval_value_xml_node(name, val, options) xdebug_get_zval_value_xml_node_ex(name, val, XDEBUG_VAR_TYPE_NORMAL, options)
-xdebug_xml_node* xdebug_get_zval_value_xml_node_ex(char *name, zval *val, int var_type, xdebug_var_export_options *options);
+xdebug_xml_node* xdebug_get_zval_value_xml_node_ex(char *name, zval *val, int var_type, xdebug_var_export_options *options TSRMLS_DC);
char* xdebug_get_zval_synopsis(zval *val, int debug_zval, xdebug_var_export_options *options);
char* xdebug_get_zval_synopsis_fancy(char *name, zval *val, int *len, int debug_zval, xdebug_var_export_options *options TSRMLS_DC);
Please sign in to comment.
Something went wrong with that request. Please try again.