From d818259863dea568aaf6a275b9dfdd3755f9f2a2 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Tue, 16 May 2017 15:51:30 +0000 Subject: [PATCH] lib: let vty.c manage its own pointers vty.c doesn't require back refs for a couple threads Signed-off-by: Quentin Young --- lib/vty.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/vty.c b/lib/vty.c index e490d30a8a..56ec707282 100644 --- a/lib/vty.c +++ b/lib/vty.c @@ -2633,18 +2633,18 @@ static struct thread_master *vty_master; static void vty_event (enum event event, int sock, struct vty *vty) { + struct thread *vty_serv_thread = NULL; + switch (event) { case VTY_SERV: - vector_set_index (Vvty_serv_thread, sock, NULL); - thread_add_read(vty_master, vty_accept, vty, sock, - (struct thread **) &Vvty_serv_thread->index[sock]); + vty_serv_thread = thread_add_read(vty_master, vty_accept, vty, sock, NULL); + vector_set_index (Vvty_serv_thread, sock, vty_serv_thread); break; #ifdef VTYSH case VTYSH_SERV: - vector_set_index (Vvty_serv_thread, sock, NULL); - thread_add_read(vty_master, vtysh_accept, vty, sock, - (struct thread **) &Vvty_serv_thread->index[sock]); + vty_serv_thread = thread_add_read(vty_master, vtysh_accept, vty, sock, NULL); + vector_set_index (Vvty_serv_thread, sock, vty_serv_thread); break; case VTYSH_READ: vty->t_read = NULL; -- 2.39.5