diff options
author | Rick Balocca <rbalocca@vyatta.com> | 2008-10-16 17:39:55 -0700 |
---|---|---|
committer | Rick Balocca <rbalocca@vyatta.com> | 2008-10-16 17:39:55 -0700 |
commit | 04c7298b3684ddda4e6669f14374e2377deb04ea (patch) | |
tree | b3c11943294ffc282863dbca418d408a7869f86f /ospfd/ospf_neighbor.c | |
parent | 1581cf27e9e187a12f25221cc42123a056469adb (diff) | |
parent | fa3e86a1a7559808ba5e32374e35d387472567c8 (diff) | |
download | quagga-04c7298b3684ddda4e6669f14374e2377deb04ea.tar.bz2 quagga-04c7298b3684ddda4e6669f14374e2377deb04ea.tar.xz |
Merge branch 'islavista'
Conflicts:
debian/changelog
Diffstat (limited to 'ospfd/ospf_neighbor.c')
-rw-r--r-- | ospfd/ospf_neighbor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c index 843e93f6..967ca15d 100644 --- a/ospfd/ospf_neighbor.c +++ b/ospfd/ospf_neighbor.c @@ -69,8 +69,7 @@ ospf_nbr_new (struct ospf_interface *oi) struct ospf_neighbor *nbr; /* Allcate new neighbor. */ - nbr = XMALLOC (MTYPE_OSPF_NEIGHBOR, sizeof (struct ospf_neighbor)); - memset (nbr, 0, sizeof (struct ospf_neighbor)); + nbr = XCALLOC (MTYPE_OSPF_NEIGHBOR, sizeof (struct ospf_neighbor)); /* Relate neighbor to the interface. */ nbr->oi = oi; |