summaryrefslogtreecommitdiffstats
path: root/lib/vty_cli.c
diff options
context:
space:
mode:
authorChris Hall <chris.hall@highwayman.com>2011-03-29 01:49:16 +0100
committerChris Hall <chris.hall@highwayman.com>2011-03-29 01:49:16 +0100
commitf9956b9524ddafdb9d0cec042213eaa8229aad8c (patch)
treebf362c892837ef3f5a6a4d4265eb18e1b47ccf33 /lib/vty_cli.c
parent9470cb2c32eab220f796b1438b787528272cbe84 (diff)
downloadquagga-ex15p.tar.bz2
quagga-ex15p.tar.xz
Bring "ex" version up to date with 0.99.18ex15p
Release: 0.99.18ex15p -- Pipework Branch Also fixes issue with unknown attributes -- does not release them prematurely. Contains the "bgpd: New show commands for improved view and address family support", which is post 0.99.18. (But not RFC 5082 GTSM.)
Diffstat (limited to 'lib/vty_cli.c')
-rw-r--r--lib/vty_cli.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/vty_cli.c b/lib/vty_cli.c
index 3b82a112..311d950c 100644
--- a/lib/vty_cli.c
+++ b/lib/vty_cli.c
@@ -155,7 +155,7 @@ uty_cli_new(vio_vf vf)
cli->cls = qs_new(120) ;
cli->clx = qs_new(120) ;
- cli->cbuf = vio_fifo_init_new(NULL, 1000) ;
+ cli->cbuf = vio_fifo_new(1000) ;
cli->olc = vio_lc_new(0 , 0, telnet_newline) ;
@@ -258,12 +258,12 @@ uty_cli_close(vty_cli cli, bool final)
/* If final, free the CLI object. */
if (final)
{
- cli->prompt_for_node = qs_reset(cli->prompt_for_node, free_it) ;
- cli->cl = qs_reset(cli->cl, free_it) ;
- cli->cls = qs_reset(cli->cls, free_it) ;
+ cli->prompt_for_node = qs_free(cli->prompt_for_node) ;
+ cli->cl = qs_free(cli->cl) ;
+ cli->cls = qs_free(cli->cls) ;
- cli->cbuf = vio_fifo_reset(cli->cbuf, free_it) ;
- cli->olc = vio_lc_reset(cli->olc, free_it) ;
+ cli->cbuf = vio_fifo_free(cli->cbuf) ;
+ cli->olc = vio_lc_free(cli->olc) ;
XFREE(MTYPE_VTY_CLI, cli) ; /* sets cli = NULL */
} ;