From: krakjoe <joe.watkins@live.co.uk>
Date: Tue, 12 Nov 2013 01:58:39 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/krakjoe/phpdbg
X-Git-Tag: php-5.6.0alpha1~110^2~459
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa3056c8332f6bc423b85cbf7312fb40a9f6023f;p=php

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

fa3056c8332f6bc423b85cbf7312fb40a9f6023f
diff --cc phpdbg.h
index 6b24dad848,2e392e9dbb..908c1cc4b7
--- a/phpdbg.h
+++ b/phpdbg.h
@@@ -57,6 -50,7 +57,7 @@@
  #define PHPDBG_HAS_SYM_BP       0x00000010
  #define PHPDBG_HAS_OPLINE_BP    0x00000100
  #define PHPDBG_HAS_METHOD_BP    0x00001000
 -#define PHPDBG_BP_MASK (PHPDBG_HAS_FILE_BP|PHPDBG_HAS_SYM_BP|PHPDBG_HAS_METHOD_BP|PHPDBG_HAS_OPLINE_BP)
++#define PHPDBG_BP_MASK          (PHPDBG_HAS_FILE_BP|PHPDBG_HAS_SYM_BP|PHPDBG_HAS_METHOD_BP|PHPDBG_HAS_OPLINE_BP)
  
  #define PHPDBG_IS_STEPPING      0x00010000
  #define PHPDBG_IS_QUIET         0x00100000
diff --cc phpdbg_bp.c
index bcca1da23e,d147d59e51..fef5775c1e
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@@ -98,8 -98,8 +98,8 @@@ void phpdbg_set_breakpoint_method(cons
                                    size_t func_len TSRMLS_DC) /* {{{ */
  {
      HashTable class_breaks, *class_table;
-     
+ 
 -    if (zend_hash_find(&PHPDBG_G(bp_methods), class_name, class_len, (void**)&class_table) != SUCCESS) {
 +    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(
@@@ -267,12 -267,12 +267,13 @@@ int phpdbg_find_breakpoint_opline(phpdb
  
  void phpdbg_clear_breakpoints(TSRMLS_D) /* {{{ */
  {
 -    zend_hash_clean(&PHPDBG_G(bp_files));
 -    zend_hash_clean(&PHPDBG_G(bp_symbols));
 -    zend_hash_clean(&PHPDBG_G(bp_oplines));
 -    zend_hash_clean(&PHPDBG_G(bp_methods));
 -
 +    zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_FILE]);
 +    zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_SYM]);
 +    zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_OPLINE]);
 +    zend_hash_clean(&PHPDBG_G(bp)[PHPDBG_BREAK_METHOD]);
 +    
-     PHPDBG_G(flags) &= ~(PHPDBG_HAS_FILE_BP|PHPDBG_HAS_SYM_BP|PHPDBG_HAS_METHOD_BP|PHPDBG_HAS_OPLINE_BP);
+     PHPDBG_G(flags) &= ~PHPDBG_BP_MASK;
++
      PHPDBG_G(bp_count) = 0;
  } /* }}} */