From: Felipe Pena <felipensp@gmail.com>
Date: Tue, 12 Nov 2013 02:25:30 +0000 (-0200)
Subject: - Fix conflict
X-Git-Tag: php-5.6.0alpha1~110^2~456^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=629b96295e1770afb94ed5f515a8f22fc3a11330;p=php

- Fix conflict
---

629b96295e1770afb94ed5f515a8f22fc3a11330
diff --cc phpdbg_prompt.c
index 65edb55f18,fb6ba7cebc..f7ec9419b8
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -411,7 -410,15 +411,15 @@@ static PHPDBG_COMMAND(clean) /* {{{ *
          printf("[\tFunctions: %d]\n", zend_hash_num_elements(EG(function_table)));
          printf("[\tConstants: %d]\n", zend_hash_num_elements(EG(zend_constants)));
          printf("[\tIncluded: %d]\n", zend_hash_num_elements(&EG(included_files)));
 -        
 +
+         /* this is implicitly required */
+         if (PHPDBG_G(ops)) {
+             destroy_op_array(
+                 PHPDBG_G(ops) TSRMLS_CC);
+             efree(PHPDBG_G(ops));
+             PHPDBG_G(ops) = NULL;
+         }
 -        
++
          zend_hash_reverse_apply(EG(function_table), (apply_func_t) clean_non_persistent_function_full TSRMLS_CC);
          zend_hash_reverse_apply(EG(class_table), (apply_func_t) clean_non_persistent_class_full TSRMLS_CC);
          zend_hash_reverse_apply(EG(zend_constants), (apply_func_t) clean_non_persistent_constant_full TSRMLS_CC);
@@@ -434,11 -441,11 +442,11 @@@
  static PHPDBG_COMMAND(clear) /* {{{ */
  {
      printf("[Clearing Breakpoints:]\n");
-     printf("[\tFile\t%d]\n", zend_hash_num_elements(&PHPDBG_G(bp_files)));
-     printf("[\tSymbols\t%d]\n", zend_hash_num_elements(&PHPDBG_G(bp_symbols)));
-     printf("[\tOplines\t%d]\n", zend_hash_num_elements(&PHPDBG_G(bp_oplines)));
-     printf("[\tMethods\t%d]\n", zend_hash_num_elements(&PHPDBG_G(bp_methods)));
+     printf("[\tFile\t%d]\n", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_FILE]));
+     printf("[\tSymbols\t%d]\n", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_SYM]));
+     printf("[\tOplines\t%d]\n", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_OPLINE]));
+     printf("[\tMethods\t%d]\n", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_METHOD]));
 -    
 +
      phpdbg_clear_breakpoints(TSRMLS_C);
  
      return SUCCESS;