Fixed dangling uses of bgp_notify_free()

  modified:   bgpd/bgp_msg_write.c
  modified:   bgpd/bgp_notification.c
  modified:   bgpd/bgp_open_state.c
  modified:   bgpd/bgp_peer.c
  modified:   bgpd/bgp_session.c

5 files changed, 7 insertions, 9 deletions

diff --git a/bgpd/bgp_msg_write.c b/bgpd/bgp_msg_write.c
index f4345f49..c321df59 100644
--- a/bgpd/bgp_msg_write.c
+++ b/bgpd/bgp_msg_write.c
@@ -136,7 +136,7 @@ bgp_msg_write_notification(bgp_connection connection, bgp_notify notification)
 #if 0
     bgp_notify_print(peer, text_form, "sending") ;
 #endif
-    bgp_notify_free(&text_form) ;
+    bgp_notify_free(text_form) ;
   } ;
 
   /* Finally -- write the obuf away                     */
diff --git a/bgpd/bgp_notification.c b/bgpd/bgp_notification.c
index 392289d0..6676b346 100644
--- a/bgpd/bgp_notification.c
+++ b/bgpd/bgp_notification.c
@@ -128,7 +128,7 @@ bgp_notify_unset(bgp_notify* p_notification)
 extern void
 bgp_notify_set(bgp_notify* p_dst, bgp_notify src)
 {
-  bgp_notify_free(p_dst) ;
+  bgp_notify_free(*p_dst) ;
   *p_dst = src ;
 } ;
 
@@ -153,7 +153,7 @@ bgp_notify_set_dup(bgp_notify* p_dst, bgp_notify src)
 extern void
 bgp_notify_set_mov(bgp_notify* p_dst, bgp_notify* p_src)
 {
-  bgp_notify_free(p_dst) ;
+  bgp_notify_free(*p_dst) ;
   *p_dst = *p_src ;
   *p_src = NULL ;
 } ;
diff --git a/bgpd/bgp_open_state.c b/bgpd/bgp_open_state.c
index 80cd3f33..a8f880af 100644
--- a/bgpd/bgp_open_state.c
+++ b/bgpd/bgp_open_state.c
@@ -83,8 +83,6 @@ bgp_open_state_free(bgp_open_state state)
 extern void
 bgp_open_state_unset(bgp_open_state* p_state)
 {
-  bgp_cap_unknown unknown ;
-
   bgp_open_state_free(*p_state) ;
   *p_state = NULL ;
 } ;
diff --git a/bgpd/bgp_peer.c b/bgpd/bgp_peer.c
index 7607014e..c959c958 100644
--- a/bgpd/bgp_peer.c
+++ b/bgpd/bgp_peer.c
@@ -169,7 +169,7 @@ bgp_session_has_established(bgp_peer peer)
     SET_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN);
 
   /* Clear last notification data. */
-  bgp_notify_free(&(peer->notify));
+  bgp_notify_unset(&(peer->notify));
 
   /* Clear start timer value to default. */
   peer->v_start = BGP_INIT_START_TIMER;
diff --git a/bgpd/bgp_session.c b/bgpd/bgp_session.c
index 4363344e..5ee07d65 100644
--- a/bgpd/bgp_session.c
+++ b/bgpd/bgp_session.c
@@ -184,7 +184,7 @@ bgp_session_free(bgp_session session)
 
   qpt_mutex_destroy(&session->mutex, 0) ;
 
-  bgp_notify_free(&session->notification);
+  bgp_notify_free(session->notification);
   bgp_open_state_free(session->open_send);
   bgp_open_state_free(session->open_recv);
   if (session->host != NULL)
@@ -239,7 +239,7 @@ bgp_session_enable(bgp_peer peer)
   session->made     = 0;
   session->defer_enable = 0;
   session->event    = bgp_session_null_event;
-  bgp_notify_free(&session->notification);
+  bgp_notify_unset(&session->notification);
   session->err      = 0;
   session->ordinal  = 0;
 
@@ -343,7 +343,7 @@ bgp_session_disable(bgp_peer peer, bgp_notify notification)
   if ( (session->state != bgp_session_sEnabled) &&
        (session->state != bgp_session_sEstablished) ) ;
     {
-      bgp_notify_free(&notification) ;  /* discard any bgp_notify       */
+      bgp_notify_free(notification) ;  /* discard any bgp_notify        */
       return ;
     } ;