Commit: fa3056c8332f6bc423b85cbf7312fb40a9f6023f Author: krakjoe <joe.watk...@live.co.uk> Tue, 12 Nov 2013 01:58:39 +0000 Parents: c2365d8283971f6318a5693ff5983de043ff81b2 77cb82dd2256cf89a95e89b0e04835e54b1a4cbd Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fa3056c8332f6bc423b85cbf7312fb40a9f6023f Log: Merge branch 'master' of https://github.com/krakjoe/phpdbg Changed paths: MM phpdbg.h MM phpdbg_bp.c Diff: diff --cc phpdbg.h index 6b24dad,2e392e9..908c1cc --- 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 bcca1da,d147d59..fef5775 --- 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; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
