From: krakjoe <joe.watkins@live.co.uk>
Date: Mon, 11 Nov 2013 08:08:26 +0000 (+0000)
Subject: clean not destroy included files
X-Git-Tag: php-5.6.0alpha1~110^2~495
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f82f002f0d72d948c1e52f79a2a66d5d00a3581;p=php

clean not destroy included files
remove argc, argv from phpdbg_interactive, unused
---

diff --git a/phpdbg.c b/phpdbg.c
index 3d4908cf62..bae33aab91 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -355,7 +355,7 @@ int main(int argc, char *argv[]) /* {{{ */
 
         do {
 		    zend_try {
-		        phpdbg_interactive(argc, argv TSRMLS_CC);
+		        phpdbg_interactive(TSRMLS_C);
 		    } zend_catch {
 		    
 		    } zend_end_try();
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index f8a203c50e..8238ea32cf 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -270,7 +270,7 @@ static PHPDBG_COMMAND(clean) /* {{{ */
     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); 
-    zend_hash_destroy(&EG(included_files));
+    zend_hash_clean(&EG(included_files));
     return SUCCESS;
 } /* }}} */
 
@@ -347,7 +347,7 @@ int phpdbg_do_cmd(const phpdbg_command_t *command, char *cmd_line, size_t cmd_le
 	return FAILURE;
 } /* }}} */
 
-int phpdbg_interactive(int argc, char **argv TSRMLS_DC) /* {{{ */
+int phpdbg_interactive(TSRMLS_D) /* {{{ */
 {
 	char cmd[PHPDBG_MAX_CMD];
 
@@ -417,7 +417,7 @@ zend_vm_enter:
 
         if (PHPDBG_G(has_file_bp)
 			&& phpdbg_find_breakpoint_file(execute_data->op_array TSRMLS_CC) == SUCCESS) {
-			while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
+			while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
 				continue;
 			}
 		}
@@ -429,7 +429,7 @@ zend_vm_enter:
 					|| previous->opline->opcode == ZEND_DO_FCALL_BY_NAME) {
 					if (phpdbg_find_breakpoint_symbol(
 						previous->function_state.function TSRMLS_CC) == SUCCESS) {
-						while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
+						while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
 							continue;
 						}
 					}
@@ -443,7 +443,7 @@ zend_vm_enter:
 		    execute_data TSRMLS_CC);
 
 		if (PHPDBG_G(stepping)) {
-			while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
+			while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
 				continue;
 			}
 		}
diff --git a/phpdbg_prompt.h b/phpdbg_prompt.h
index 6675624dbd..bddc7f99f7 100644
--- a/phpdbg_prompt.h
+++ b/phpdbg_prompt.h
@@ -58,7 +58,7 @@ int phpdbg_do_cmd(const phpdbg_command_t *command, char *cmd_line, size_t cmd_le
 #define PHPDBG_COMMAND(name) \
 	int phpdbg_do_##name(const char *expr, size_t expr_len TSRMLS_DC)
 
-int phpdbg_interactive(int argc, char **argv TSRMLS_DC);
+int phpdbg_interactive(TSRMLS_D);
 void phpdbg_execute_ex(zend_execute_data *execute_data TSRMLS_DC);
 
 #endif /* PHPDBG_PROMPT_H */