From 3690074a486cfada568975e287d9cbb9e687501f Mon Sep 17 00:00:00 2001 From: Chris Hall Date: Fri, 2 Sep 2011 00:53:59 +0100 Subject: Merging of euro_ix branch into pipework. Bring in fixes for bgp dumping with pthreaded BGP Engine. Bring in new "show nexus xxx" command. Fix removal of '~' prompt. --- lib/vty_cli.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'lib/vty_cli.c') diff --git a/lib/vty_cli.c b/lib/vty_cli.c index a6a276e8..a4ab8de3 100644 --- a/lib/vty_cli.c +++ b/lib/vty_cli.c @@ -261,9 +261,7 @@ uty_cli_close(vty_cli cli, bool final) /* Discard any pause_timer, and suppress */ cli->pause_timer = qtimer_free(cli->pause_timer) ; cli->paused = false ; -#if 0 cli->tilde_enabled = false ; -#endif /* If final, free the CLI object. */ if (final) @@ -817,11 +815,7 @@ uty_cli_dispatch(vty_cli cli) uty_cmd_signal(vio, CMD_SUCCESS) ; - cli->blocked = (to_do_now != cmd_do_command) -#if 0 - || !cli->tilde_enabled -#endif - ; + cli->blocked = (to_do_now != cmd_do_command) || !cli->tilde_enabled ; } else { -- cgit v1.2.3