Second tranche of updates for pipework branch.

	modified:   bgpd/bgp_connection.c
	modified:   bgpd/bgp_debug.c
	modified:   bgpd/bgp_engine.h
	modified:   bgpd/bgp_main.c
	modified:   bgpd/bgp_packet.c
	modified:   bgpd/bgp_peer.c
	modified:   bgpd/bgp_route.c
	modified:   bgpd/bgp_routemap.c
	modified:   bgpd/bgp_session.c
	modified:   bgpd/bgp_vty.c
	modified:   bgpd/bgpd.c
	modified:   bgpd/bgpd.h
	modified:   configure.ac
	modified:   isisd/dict.h
	modified:   isisd/isis_misc.c
	modified:   isisd/isis_routemap.c
	modified:   isisd/isis_spf.c
	modified:   lib/Makefile.am
	modified:   lib/command.c
	modified:   lib/command.h
	modified:   lib/command_execute.h
	modified:   lib/command_parse.c
	modified:   lib/command_parse.h
	modified:   lib/command_queue.c
	modified:   lib/command_queue.h
	modified:   lib/elstring.h
	modified:   lib/heap.c
	modified:   lib/if.c
	modified:   lib/if.h
	modified:   lib/keychain.c
	modified:   lib/keystroke.c
	modified:   lib/keystroke.h
	modified:   lib/list_util.c
	modified:   lib/list_util.h
	modified:   lib/log.c
	modified:   lib/log.h
	modified:   lib/memory.c
	modified:   lib/memory.h
	modified:   lib/memtypes.c
	modified:   lib/misc.h
	modified:   lib/mqueue.c
	modified:   lib/mqueue.h
	deleted:    lib/node_type.h
	modified:   lib/pthread_safe.c
	modified:   lib/qfstring.c
	modified:   lib/qiovec.c
	modified:   lib/qiovec.h
	modified:   lib/qpath.c
	modified:   lib/qpnexus.c
	modified:   lib/qpnexus.h
	modified:   lib/qpselect.c
	modified:   lib/qpthreads.h
	modified:   lib/qstring.c
	modified:   lib/qstring.h
	modified:   lib/qtime.c
	modified:   lib/qtime.h
	modified:   lib/qtimers.c
	modified:   lib/qtimers.h
	modified:   lib/routemap.c
	modified:   lib/symtab.h
	modified:   lib/thread.h
	deleted:    lib/uty.h
	modified:   lib/vector.c
	modified:   lib/vector.h
	modified:   lib/version.h.in
	modified:   lib/vio_fifo.c
	modified:   lib/vio_fifo.h
	modified:   lib/vio_lines.c
	modified:   lib/vio_lines.h
	modified:   lib/vty.c
	modified:   lib/vty.h
	modified:   lib/vty_cli.c
	modified:   lib/vty_cli.h
	modified:   lib/vty_io.c
	modified:   lib/vty_io.h
	modified:   lib/vty_io_basic.c
	modified:   lib/vty_io_basic.h
	modified:   lib/vty_io_file.c
	modified:   lib/vty_io_file.h
	modified:   lib/vty_io_shell.c
	modified:   lib/vty_io_term.c
	modified:   lib/vty_io_term.h
	modified:   lib/vty_local.h
	modified:   lib/vty_pipe.c
	modified:   lib/workqueue.h
	modified:   lib/zebra.h
	modified:   ospf6d/ospf6_lsa.c
	modified:   ripngd/ripngd.c
	modified:   tests/test-list_util.c
	modified:   tests/test-vector.c
	modified:   vtysh/vtysh.c
	modified:   vtysh/vtysh_config.c

1 files changed, 19 insertions, 19 deletions

diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index c4cf9cf6..f7494f19 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -367,7 +367,7 @@ DEFUN (debug_bgp_as4,
        BGP_STR
        "BGP AS4 actions\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_ON (as4, AS4);
   else
     {
@@ -385,7 +385,7 @@ DEFUN (no_debug_bgp_as4,
        BGP_STR
        "BGP AS4 actions\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_OFF (as4, AS4);
   else
     {
@@ -410,7 +410,7 @@ DEFUN (debug_bgp_as4_segment,
        BGP_STR
        "BGP AS4 aspath segment handling\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_ON (as4, AS4_SEGMENT);
   else
     {
@@ -428,7 +428,7 @@ DEFUN (no_debug_bgp_as4_segment,
        BGP_STR
        "BGP AS4 aspath segment handling\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_OFF (as4, AS4_SEGMENT);
   else
     {
@@ -453,7 +453,7 @@ DEFUN (debug_bgp_fsm,
        BGP_STR
        "BGP Finite State Machine\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_ON (fsm, FSM);
   else
     {
@@ -471,7 +471,7 @@ DEFUN (no_debug_bgp_fsm,
        BGP_STR
        "Finite State Machine\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_OFF (fsm, FSM);
   else
     {
@@ -496,7 +496,7 @@ DEFUN (debug_bgp_events,
        BGP_STR
        "BGP events\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_ON (events, EVENTS);
   else
     {
@@ -514,7 +514,7 @@ DEFUN (no_debug_bgp_events,
        BGP_STR
        "BGP events\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_OFF (events, EVENTS);
   else
     {
@@ -538,7 +538,7 @@ DEFUN (debug_bgp_filter,
        BGP_STR
        "BGP filters\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_ON (filter, FILTER);
   else
     {
@@ -556,7 +556,7 @@ DEFUN (no_debug_bgp_filter,
        BGP_STR
        "BGP filters\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_OFF (filter, FILTER);
   else
     {
@@ -580,7 +580,7 @@ DEFUN (debug_bgp_keepalive,
        BGP_STR
        "BGP keepalives\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_ON (keepalive, KEEPALIVE);
   else
     {
@@ -598,7 +598,7 @@ DEFUN (no_debug_bgp_keepalive,
        BGP_STR
        "BGP keepalives\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_OFF (keepalive, KEEPALIVE);
   else
     {
@@ -622,7 +622,7 @@ DEFUN (debug_bgp_update,
        BGP_STR
        "BGP updates\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     {
       DEBUG_ON (update, UPDATE_IN);
       DEBUG_ON (update, UPDATE_OUT);
@@ -645,7 +645,7 @@ DEFUN (debug_bgp_update_direct,
        "Inbound updates\n"
        "Outbound updates\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     {
       if (strncmp ("i", argv[0], 1) == 0)
 	{
@@ -684,7 +684,7 @@ DEFUN (no_debug_bgp_update,
        BGP_STR
        "BGP updates\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     {
       DEBUG_OFF (update, UPDATE_IN);
       DEBUG_OFF (update, UPDATE_OUT);
@@ -711,7 +711,7 @@ DEFUN (debug_bgp_normal,
        DEBUG_STR
        BGP_STR)
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_ON (normal, NORMAL);
   else
     {
@@ -728,7 +728,7 @@ DEFUN (no_debug_bgp_normal,
        DEBUG_STR
        BGP_STR)
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_OFF (normal, NORMAL);
   else
     {
@@ -751,7 +751,7 @@ DEFUN (debug_bgp_zebra,
        BGP_STR
        "BGP Zebra messages\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_ON (zebra, ZEBRA);
   else
     {
@@ -769,7 +769,7 @@ DEFUN (no_debug_bgp_zebra,
        BGP_STR
        "BGP Zebra messages\n")
 {
-  if (vty_get_node(vty) == CONFIG_NODE)
+  if (vty->node == CONFIG_NODE)
     DEBUG_OFF (zebra, ZEBRA);
   else
     {