diff options
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 2 | ||||
| -rw-r--r-- | lib/filter.c | 8 | ||||
| -rw-r--r-- | lib/stream.c | 6 |
3 files changed, 4 insertions, 12 deletions
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 81e0b94b3c..9a1d903350 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -139,8 +139,6 @@ bgp_nlri_parse_vpnv4 (struct peer *peer, struct attr *attr, return -1; } - (void)decode_label (pnt); - /* Copyr label to prefix. */ tagpnt = pnt;; diff --git a/lib/filter.c b/lib/filter.c index ae50e6cbe0..0eeb8f1872 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -496,13 +496,13 @@ access_list_filter_delete (struct access_list *access, struct filter *filter) filter_free (filter); route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_DELETED); - /* If access_list becomes empty delete it from access_master. */ - if (access_list_empty (access)) - access_list_delete (access); - /* Run hook function. */ if (master->delete_hook) (*master->delete_hook) (access); + + /* If access_list becomes empty delete it from access_master. */ + if (access_list_empty (access)) + access_list_delete (access); } /* diff --git a/lib/stream.c b/lib/stream.c index cc5898a6db..fcdf56f64f 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -93,12 +93,6 @@ stream_new (size_t size) assert (size > 0); - if (size == 0) - { - zlog_warn ("stream_new(): called with 0 size!"); - return NULL; - } - s = XCALLOC (MTYPE_STREAM, sizeof (struct stream)); if (s == NULL) |