[xdebug-dev] xdebug xdebug/usefulstuff.c xdebug/xdebug_handler_dbgp.c - Make this work with ZTS again.

Date: Fri Aug 27 08:58:18 CEST 2004
User: Derick Rethans
Directory: xdebug

Log Message:
[0.05]
- Make this work with ZTS again.

Modified files:
           xdebug/usefulstuff.c (version: 1.21)
           xdebug/xdebug_handler_dbgp.c (version: 1.57)

[FILE: /xdebug/usefulstuff.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xdebug/usefulstuff.c:1.20 Thu Aug 26 07:18:55 2004 GMT
+++ xdebug/usefulstuff.c Fri Aug 27 04:58:18 2004 GMT
@@ -284,7 +284,7 @@
 }
 
 /* fake URI's per IETF RFC 1738 and 2396 format */
-char *xdebug_path_to_url(const char *fileurl)
+char *xdebug_path_to_url(const char *fileurl TSRMLS_DC)
 {
         int l, i, new_len;
         char *tmp = NULL;

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xdebug/xdebug_handler_dbgp.c:1.56 Mon Aug 23 04:31:05 2004 GMT
+++ xdebug/xdebug_handler_dbgp.c Fri Aug 27 04:58:18 2004 GMT
@@ -325,8 +325,8 @@
         xdebug_xml_add_attribute_ex(tmp, "where", xdstrdup(tmp_fname), 0, 1);
         xdebug_xml_add_attribute_ex(tmp, "level", xdebug_sprintf("%ld", nr), 0, 1);
         if (fse_prev) {
- xdebug_xml_add_attribute_ex(tmp, "filename", xdebug_path_to_url(fse_prev->filename), 0, 1);
- xdebug_xml_add_attribute_ex(tmp, "lineno", xdebug_sprintf("%lu", fse_prev->lineno), 0, 1);
+ xdebug_xml_add_attribute_ex(tmp, "filename", xdebug_path_to_url(fse_prev->filename TSRMLS_CC), 0, 1);
+ xdebug_xml_add_attribute_ex(tmp, "lineno", xdebug_sprintf("%lu", fse_prev->lineno TSRMLS_CC), 0, 1);
         } else {
                 xdebug_xml_add_attribute_ex(tmp, "filename", xdebug_path_to_url(zend_get_executed_filename(TSRMLS_C)), 0, 1);
                 xdebug_xml_add_attribute_ex(tmp, "lineno", xdebug_sprintf("%lu", zend_get_executed_lineno(TSRMLS_C)), 0, 1);
@@ -390,11 +390,13 @@
 
 static void breakpoint_brk_info_add(xdebug_xml_node *xml, xdebug_brk_info *brk)
 {
+ TSRMLS_FETCH();
+
         if (brk->type) {
                 xdebug_xml_add_attribute_ex(xml, "type", xdstrdup(brk->type), 0, 1);
         }
         if (brk->file) {
- xdebug_xml_add_attribute_ex(xml, "filename", xdebug_path_to_url(brk->file), 0, 1);
+ xdebug_xml_add_attribute_ex(xml, "filename", xdebug_path_to_url(brk->file TSRMLS_CC), 0, 1);
         }
         if (brk->lineno) {
                 xdebug_xml_add_attribute_ex(xml, "lineno", xdebug_sprintf("%lu", brk->lineno), 0, 1);
@@ -1589,7 +1591,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.56 $";
+ return "$Revision: 1.57 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
@@ -1656,7 +1658,7 @@
         if (strcmp(context->program_name, "-") == 0) {
                 xdebug_xml_add_attribute_ex(response, "fileuri", xdstrdup("dbgp://stdin"), 0, 1);
         } else {
- xdebug_xml_add_attribute_ex(response, "fileuri", xdebug_path_to_url(context->program_name), 0, 1);
+ xdebug_xml_add_attribute_ex(response, "fileuri", xdebug_path_to_url(context->program_name TSRMLS_CC), 0, 1);
         }
         xdebug_xml_add_attribute_ex(response, "language", "PHP", 0, 0);
         xdebug_xml_add_attribute_ex(response, "protocol_version", DBGP_VERSION, 0, 0);
Received on Fri Aug 27 2004 - 08:58:28 BST