[xdebug-dev] svn: /xdebug/trunk/ xdebug.c xdebug_stack.c

derick Sun, 15 Aug 2010 16:11:41 +0000

Revision: http://svn.xdebug.org/cgi-bin/viewvc.cgi?view=rev&revision=3338&root=xdebug

Log:
- Fixed TSRM_LS issues
- Fixed "lack of output issue", but that reintroduces a memleak.
- Patch by Michael Maclean.

Changed paths:
    U xdebug/trunk/xdebug.c
    U xdebug/trunk/xdebug_stack.c

Modified: xdebug/trunk/xdebug.c
===================================================================
--- xdebug/trunk/xdebug.c 2010-08-07 16:14:12 UTC (rev 3337)
+++ xdebug/trunk/xdebug.c 2010-08-15 16:11:41 UTC (rev 3338)
@@ -488,7 +488,7 @@
 }

 #ifndef PHP_WIN32
-int xdebug_is_output_tty()
+int xdebug_is_output_tty(TSRMLS_D)
 {
         if (XG(output_is_tty) == OUTPUT_NOT_CHECKED) {
                 php_stream *output = php_stream_open_wrapper("php://stdout", "w", REPORT_ERRORS, NULL);
@@ -501,7 +501,6 @@
                 } else {
                         XG(output_is_tty) = OUTPUT_IS_TTY;
                 }
- php_stream_close(output);
         }
         return (XG(output_is_tty));
 }

Modified: xdebug/trunk/xdebug_stack.c
===================================================================
--- xdebug/trunk/xdebug_stack.c 2010-08-07 16:14:12 UTC (rev 3337)
+++ xdebug/trunk/xdebug_stack.c 2010-08-15 16:11:41 UTC (rev 3338)
@@ -136,7 +136,7 @@
         zvar = xdebug_get_php_symbol(name, strlen(name) + 1);
         XG(active_symbol_table) = tmp_ht;

- formats = select_formats(PG(html_errors));
+ formats = select_formats(PG(html_errors) TSRMLS_CC);

         if (!zvar) {
                 xdebug_str_add(str, xdebug_sprintf(formats[9], name), 1);
@@ -416,7 +416,7 @@
         }
 }

-static void xdebug_append_error_footer(xdebug_str *str, int html)
+static void xdebug_append_error_footer(xdebug_str *str, int html TSRMLS_DC)
 {
         char **formats = select_formats(html TSRMLS_CC);

@@ -436,7 +436,7 @@
         xdebug_append_error_head(&str, html TSRMLS_CC);
         xdebug_append_error_description(&str, html, error_type_str, buffer, error_filename, error_lineno TSRMLS_CC);
         xdebug_append_printable_stack(&str, html TSRMLS_CC);
- xdebug_append_error_footer(&str, html);
+ xdebug_append_error_footer(&str, html TSRMLS_CC);
         xdebug_str_add(&str, append_string ? append_string : "", 0);

         return str.d;
@@ -569,7 +569,7 @@
                                 xdebug_append_error_description(&str, PG(html_errors), error_type_str, tmp_buf, error_filename, error_lineno TSRMLS_CC);
                                 xdebug_append_printable_stack(&str, PG(html_errors) TSRMLS_CC);
                                 xdebug_str_add(&str, XG(last_exception_trace), 0);
- xdebug_append_error_footer(&str, PG(html_errors));
+ xdebug_append_error_footer(&str, PG(html_errors) TSRMLS_CC);
                                 php_printf("%s", str.d);

                                 xdfree(str.d);
Received on Sun Aug 15 2010 - 17:11:42 BST