summaryrefslogtreecommitdiffstats
path: root/bgpd/bgp_attr.c
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-27 14:25:29 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-27 14:25:29 -0700
commitea01b56bc3f43b268d32d175095a2a930d3b2967 (patch)
treee3e11bc827541bc983105a731636a78bc30bb5fa /bgpd/bgp_attr.c
parent0eb78a78cffc4a5c13e2b5daff5fa257b3f1d8d6 (diff)
parentd3e384e4f00aa90db4310f82f3cbe6528e256334 (diff)
downloadquagga-ea01b56bc3f43b268d32d175095a2a930d3b2967.tar.bz2
quagga-ea01b56bc3f43b268d32d175095a2a930d3b2967.tar.xz
Merge in latest quagga (0.99.11)
Merge in current upstream version of quagga.
Diffstat (limited to 'bgpd/bgp_attr.c')
-rw-r--r--bgpd/bgp_attr.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index c52c776e..d116c30f 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -148,13 +148,13 @@ cluster_free (struct cluster_list *cluster)
XFREE (MTYPE_CLUSTER, cluster);
}
-#if 0
static struct cluster_list *
cluster_dup (struct cluster_list *cluster)
{
struct cluster_list *new;
- new = XCALLOC (MTYPE_CLUSTER, sizeof (struct cluster_list));
+ new = XMALLOC (MTYPE_CLUSTER, sizeof (struct cluster_list));
+ memset (new, 0, sizeof (struct cluster_list));
new->length = cluster->length;
if (cluster->length)
@@ -167,7 +167,6 @@ cluster_dup (struct cluster_list *cluster)
return new;
}
-#endif
static struct cluster_list *
cluster_intern (struct cluster_list *cluster)
@@ -2299,8 +2298,6 @@ bgp_packet_withdraw (struct peer *peer, struct stream *s, struct prefix *p,
void
bgp_attr_init (void)
{
- void attrhash_init ();
-
aspath_init ();
attrhash_init ();
community_init ();