[xdebug-dev] xdebug xdebug/xdebug_handler_dbgp.c - Fixed bug #72: breakpoint_get returns wrong structure.

Date: Fri Jul 9 15:36:39 CEST 2004
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- Fixed bug #72: breakpoint_get returns wrong structure.

Modified files:
           xdebug/xdebug_handler_dbgp.c (version: 1.45)

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xdebug/xdebug_handler_dbgp.c:1.44 Sun Jun 06 00:03:54 2004 GMT
+++ xdebug/xdebug_handler_dbgp.c Fri Jul 09 11:36:39 2004 GMT
@@ -541,6 +541,7 @@
         int type;
         char *hkey;
         xdebug_brk_info *brk_info;
+ xdebug_xml_node *breakpoint_node;
         XDEBUG_STR_SWITCH_DECL;
 
         if (!CMD_OPTION('d')) {
@@ -567,9 +568,10 @@
                         }
                 }
 
- breakpoint_brk_info_add(*retval, brk_info);
- /* Now we add some common attributes */
- xdebug_xml_add_attribute_ex(*retval, "id", xdstrdup(CMD_OPTION('d')), 0, 1);
+ breakpoint_node = xdebug_xml_node_init("breakpoint");
+ breakpoint_brk_info_add(breakpoint_node, brk_info);
+ xdebug_xml_add_attribute_ex(breakpoint_node, "id", xdstrdup(CMD_OPTION('d')), 0, 1);
+ xdebug_xml_add_child(*retval, breakpoint_node);
 
                 if (action == BREAKPOINT_ACTION_REMOVE) {
                         /* Now we remove the crap */
@@ -710,6 +712,10 @@
                 }
         } else
 
+ if (strcmp(CMD_OPTION('t'), "conditional") == 0) {
+ RETURN_RESULT(XG(status), XG(reason), XDEBUG_ERROR_BREAKPOINT_TYPE_NOT_SUPPORTED);
+ } else
+
         if (strcmp(CMD_OPTION('t'), "exception") == 0) {
                 RETURN_RESULT(XG(status), XG(reason), XDEBUG_ERROR_BREAKPOINT_TYPE_NOT_SUPPORTED);
         } else
@@ -1528,7 +1534,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.44 $";
+ return "$Revision: 1.45 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
Received on Fri Jul 09 2004 - 15:36:45 BST