[xdebug-dev] svn: /xdebug/ branches/xdebug_2_1/xdebug.c trunk/xdebug.c

derick Fri, 23 Jul 2010 23:26:02 +0000

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

Log:
- Fixed bug #596: Call breakpoint never works with instance methods, only
  static methods.

Changed paths:
    U xdebug/branches/xdebug_2_1/xdebug.c
    U xdebug/trunk/xdebug.c

Modified: xdebug/branches/xdebug_2_1/xdebug.c
===================================================================
--- xdebug/branches/xdebug_2_1/xdebug.c 2010-07-23 16:54:07 UTC (rev 3328)
+++ xdebug/branches/xdebug_2_1/xdebug.c 2010-07-23 23:26:02 UTC (rev 3329)
@@ -1044,11 +1044,7 @@
         }
         /* class->function breakpoints */
         else if (fse->function.type == XFUNC_MEMBER || fse->function.type == XFUNC_STATIC_MEMBER) {
- if (fse->function.type == XFUNC_MEMBER) {
- tmp_name = xdebug_sprintf("%s->%s", fse->function.class, fse->function.function);
- } else if( fse->function.type == XFUNC_STATIC_MEMBER) {
- tmp_name = xdebug_sprintf("%s::%s", fse->function.class, fse->function.function);
- }
+ tmp_name = xdebug_sprintf("%s::%s", fse->function.class, fse->function.function);

                 if (xdebug_hash_find(XG(context).function_breakpoints, tmp_name, strlen(tmp_name), (void *) &extra_brk_info)) {
                         /* Yup, breakpoint found, call handler if the breakpoint is not

Modified: xdebug/trunk/xdebug.c
===================================================================
--- xdebug/trunk/xdebug.c 2010-07-23 16:54:07 UTC (rev 3328)
+++ xdebug/trunk/xdebug.c 2010-07-23 23:26:02 UTC (rev 3329)
@@ -1044,11 +1044,7 @@
         }
         /* class->function breakpoints */
         else if (fse->function.type == XFUNC_MEMBER || fse->function.type == XFUNC_STATIC_MEMBER) {
- if (fse->function.type == XFUNC_MEMBER) {
- tmp_name = xdebug_sprintf("%s->%s", fse->function.class, fse->function.function);
- } else if( fse->function.type == XFUNC_STATIC_MEMBER) {
- tmp_name = xdebug_sprintf("%s::%s", fse->function.class, fse->function.function);
- }
+ tmp_name = xdebug_sprintf("%s::%s", fse->function.class, fse->function.function);

                 if (xdebug_hash_find(XG(context).function_breakpoints, tmp_name, strlen(tmp_name), (void *) &extra_brk_info)) {
                         /* Yup, breakpoint found, call handler if the breakpoint is not
Received on Sat Jul 24 2010 - 00:26:02 BST