Commit:    969e659c4abb128017919f327aa127db36f49796
Author:    krakjoe <joe.watk...@live.co.uk>         Tue, 26 Nov 2013 16:00:28 
+0000
Parents:   6d95449e0a0f5ceb326a6fe7df9c2764ca4722e5 
6ba73338dd34a2a80e0dd25ca333bfc0b859a930
Branches:  PHP-5.6

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=969e659c4abb128017919f327aa127db36f49796

Log:
Merge branch 'master' of https://github.com/krakjoe/phpdbg

Changed paths:
  MM  phpdbg_bp.c


Diff:
diff --cc phpdbg_bp.c
index 792ac99,48e5ca0..75d0918
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@@ -200,41 -214,38 +214,41 @@@ PHPDBG_API void phpdbg_set_breakpoint_s
  
  PHPDBG_API void phpdbg_set_breakpoint_method(const char* class_name, const 
char* func_name TSRMLS_DC) /* {{{ */
  {
-     HashTable class_breaks, *class_table;
+       HashTable class_breaks, *class_table;
 -      size_t class_len = strlen(class_name);
 -      size_t func_len = strlen(func_name);
 +    size_t class_len = strlen(class_name);
 +    size_t func_len = strlen(func_name);
 +    char *lcname = zend_str_tolower_dup(func_name, func_len); 
  
-     if (zend_hash_find(&PHPDBG_G(bp)[PHPDBG_BREAK_METHOD], class_name,
+       if (zend_hash_find(&PHPDBG_G(bp)[PHPDBG_BREAK_METHOD], class_name,
                class_len, (void**)&class_table) != SUCCESS) {
-         zend_hash_init(&class_breaks, 8, NULL, phpdbg_class_breaks_dtor, 0);
-         zend_hash_update(
-             &PHPDBG_G(bp)[PHPDBG_BREAK_METHOD],
-             class_name, class_len,
-             (void**)&class_breaks, sizeof(HashTable), (void**)&class_table);
-     }
+               zend_hash_init(&class_breaks, 8, NULL, 
phpdbg_class_breaks_dtor, 0);
+               zend_hash_update(
+                       &PHPDBG_G(bp)[PHPDBG_BREAK_METHOD],
+                       class_name, class_len,
+                       (void**)&class_breaks, sizeof(HashTable), 
(void**)&class_table);
+       }
  
-     if (!zend_hash_exists(class_table, func_name, func_len)) {
-         phpdbg_breakmethod_t new_break;
+       if (!zend_hash_exists(class_table, func_name, func_len)) {
+               phpdbg_breakmethod_t new_break;
  
-         PHPDBG_G(flags) |= PHPDBG_HAS_METHOD_BP;
+               PHPDBG_G(flags) |= PHPDBG_HAS_METHOD_BP;
  
-         new_break.class_name = estrndup(class_name, class_len);
-         new_break.class_len = class_len;
-         new_break.func_name = estrndup(func_name, func_len);
-         new_break.func_len = func_len;
-         new_break.id = PHPDBG_G(bp_count)++;
+               new_break.class_name = estrndup(class_name, class_len);
+               new_break.class_len = class_len;
+               new_break.func_name = estrndup(func_name, func_len);
+               new_break.func_len = func_len;
+               new_break.id = PHPDBG_G(bp_count)++;
  
-         zend_hash_update(class_table, lcname, func_len,
 -              zend_hash_update(class_table, func_name, func_len,
++              zend_hash_update(class_table, lcname, func_len,
                        &new_break, sizeof(phpdbg_breakmethod_t), NULL);
  
-         phpdbg_notice("Breakpoint #%d added at %s::%s",
-             new_break.id, class_name, func_name);
-     } else {
+               phpdbg_notice("Breakpoint #%d added at %s::%s",
+                       new_break.id, class_name, func_name);
+       } else {
                phpdbg_notice("Breakpoint exists at %s::%s", class_name, 
func_name);
 -      }
 +    }
 +    
 +    efree(lcname);
  } /* }}} */
  
  PHPDBG_API void phpdbg_set_breakpoint_opline(zend_ulong opline TSRMLS_DC) /* 
{{{ */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to