Remove now unneeded step option (-s)

diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 38bd8f897a89acde47305673a6d13f210b0d10bb..951c17c9ddb4af6949a5e13da4680d001695bd7b 100644 (file)
--- 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 c512bb3ff39c47491647262ea22da7e61d995207..c2744b9b68a3c3f6afc22360c26e1ae34f7f2c61 100644 (file)
--- 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