From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 28 Jun 2015 20:23:50 +0000 (+0200)
Subject: Remove now unneeded step option (-s)
X-Git-Tag: php-7.1.0alpha3~25^2~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f77c44d47cc9727865473684d8914153bf53b40;p=php

Remove now unneeded step option (-s)
---

diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 38bd8f897a..951c17c9dd 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -894,7 +894,6 @@ const opt_struct OPTIONS[] = { /* {{{ */
 	/* phpdbg options */
 	{'q', 0, "no banner"},
 	{'v', 0, "disable quietness"},
-	{'s', 0, "enable stepping"},
 	{'b', 0, "boring colours"},
 	{'i', 1, "specify init"},
 	{'I', 0, "ignore init"},
@@ -1168,7 +1167,6 @@ int main(int argc, char **argv) /* {{{ */
 	long cleaning = -1;
 	zend_bool quit_immediately = 0;
 	zend_bool remote = 0;
-	int step = 0;
 	zend_phpdbg_globals *settings = NULL;
 	char *bp_tmp = NULL;
 	char *address;
@@ -1223,7 +1221,6 @@ phpdbg_main:
 	php_optarg = NULL;
 	php_optind = 1;
 	opt = 0;
-	step = 0;
 	sapi_name = NULL;
 	if (settings) {
 		exec = settings->exec;
@@ -1318,10 +1315,6 @@ phpdbg_main:
 				flags &= ~PHPDBG_IS_QUIET;
 			break;
 
-			case 's': /* set stepping on */
-				step = 1;
-			break;
-
 			case 'E': /* stepping through eval on */
 				flags |= PHPDBG_IS_STEPONEVAL;
 			break;
@@ -1677,11 +1670,6 @@ phpdbg_main:
 			goto phpdbg_out;
 		}
 
-		/* step from here, not through init */
-		if (step) {
-			PHPDBG_G(flags) |= PHPDBG_IS_STEPPING;
-		}
-
 		phpdbg_fully_started = 1;
 
 /* #ifndef for making compiler shutting up */
diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c
index c512bb3ff3..c2744b9b68 100644
--- a/sapi/phpdbg/phpdbg_help.c
+++ b/sapi/phpdbg/phpdbg_help.c
@@ -378,7 +378,6 @@ phpdbg_help_text_t phpdbg_help_text[] = {
 "  **-n**                          Disable default php.ini" CR
 "  **-q**                          Suppress welcome banner" CR
 "  **-v**                          Enable oplog output" CR
-"  **-s**                          Enable stepping" CR
 "  **-b**                          Disable colour" CR
 "  **-i**      **-i**my.init           Set .phpdbginit file" CR
 "  **-I**                          Ignore default .phpdbginit" CR