From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 24 Nov 2013 13:36:29 +0000 (-0200)
Subject: - Moved information about breakpoints to "info break"
X-Git-Tag: php-5.6.0alpha1~110^2~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97f733e60d103ce2ebac7a11c26dbd707cd469e5;p=php

- Moved information about breakpoints to "info break"
---

diff --git a/phpdbg_info.c b/phpdbg_info.c
index d665f92d7d..51e3a336ae 100644
--- a/phpdbg_info.c
+++ b/phpdbg_info.c
@@ -21,9 +21,22 @@
 #include "phpdbg.h"
 #include "phpdbg_utils.h"
 #include "phpdbg_info.h"
+#include "phpdbg_bp.h"
 
 ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
 
+PHPDBG_INFO(break) /* {{{ */
+{
+	phpdbg_print_breakpoints(PHPDBG_BREAK_FILE TSRMLS_CC);
+	phpdbg_print_breakpoints(PHPDBG_BREAK_SYM TSRMLS_CC);
+	phpdbg_print_breakpoints(PHPDBG_BREAK_METHOD TSRMLS_CC);
+	phpdbg_print_breakpoints(PHPDBG_BREAK_OPLINE TSRMLS_CC);
+	phpdbg_print_breakpoints(PHPDBG_BREAK_COND TSRMLS_CC);
+	phpdbg_print_breakpoints(PHPDBG_BREAK_OPCODE TSRMLS_CC);
+
+	return SUCCESS;
+} /* }}} */
+
 PHPDBG_INFO(files) /* {{{ */
 {
     HashPosition pos;
diff --git a/phpdbg_info.h b/phpdbg_info.h
index 727a3d6f65..23fcae6902 100644
--- a/phpdbg_info.h
+++ b/phpdbg_info.h
@@ -25,6 +25,7 @@
 #define PHPDBG_INFO(name) PHPDBG_COMMAND(info_##name)
 
 PHPDBG_INFO(files);
+PHPDBG_INFO(break);
 PHPDBG_INFO(classes);
 PHPDBG_INFO(funcs);
 PHPDBG_INFO(error);
@@ -32,12 +33,13 @@ PHPDBG_INFO(vars);
 PHPDBG_INFO(literal);
 
 static const phpdbg_command_t phpdbg_info_commands[] = {
-    PHPDBG_COMMAND_D_EX(files,   	"lists included files",  			'F', info_files,   NULL, 0),
-    PHPDBG_COMMAND_D_EX(classes, 	"lists loaded classes",  			'c', info_classes, NULL, 0),
-    PHPDBG_COMMAND_D_EX(funcs,   	"lists loaded classes",  			'f', info_funcs,   NULL, 0),
-    PHPDBG_COMMAND_D_EX(error,   	"show the last error",   			'e', info_error,   NULL, 0),
-    PHPDBG_COMMAND_D_EX(vars,    	"show active variables", 			'v', info_vars,    NULL, 0),
-    PHPDBG_COMMAND_D_EX(literal,	"show active literal constants", 	'l', info_literal, NULL, 0),
+    PHPDBG_COMMAND_D_EX(break,		 "show breakpoints",                'b', info_break,   NULL, 0),
+    PHPDBG_COMMAND_D_EX(files,   	 "lists included files",  			'F', info_files,   NULL, 0),
+    PHPDBG_COMMAND_D_EX(classes, 	 "lists loaded classes",  			'c', info_classes, NULL, 0),
+    PHPDBG_COMMAND_D_EX(funcs,   	 "lists loaded classes",  			'f', info_funcs,   NULL, 0),
+    PHPDBG_COMMAND_D_EX(error,   	 "show the last error",   			'e', info_error,   NULL, 0),
+    PHPDBG_COMMAND_D_EX(vars,    	 "show active variables", 			'v', info_vars,    NULL, 0),
+    PHPDBG_COMMAND_D_EX(literal,	 "show active literal constants", 	'l', info_literal, NULL, 0),
     PHPDBG_END_COMMAND
 };
 
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index ba10e2e47b..104d3ded0a 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -739,13 +739,6 @@ PHPDBG_COMMAND(print) /* {{{ */
 				(float) (zend_memory_usage(1 TSRMLS_CC)/1024),
 				(float) (zend_memory_usage(0 TSRMLS_CC)/1024));
 
-			phpdbg_print_breakpoints(PHPDBG_BREAK_FILE TSRMLS_CC);
-			phpdbg_print_breakpoints(PHPDBG_BREAK_SYM TSRMLS_CC);
-			phpdbg_print_breakpoints(PHPDBG_BREAK_METHOD TSRMLS_CC);
-			phpdbg_print_breakpoints(PHPDBG_BREAK_OPLINE TSRMLS_CC);
-			phpdbg_print_breakpoints(PHPDBG_BREAK_COND TSRMLS_CC);
-			phpdbg_print_breakpoints(PHPDBG_BREAK_OPCODE TSRMLS_CC);
-
 			phpdbg_writeln(SEPARATE);
 		} break;