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 /zebra/rtadv.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 'zebra/rtadv.c')
| -rw-r--r-- | zebra/rtadv.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 0097e28f..86956ed7 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -84,10 +84,7 @@ struct rtadv *rtadv = NULL; static struct rtadv * rtadv_new (void) { - struct rtadv *new; - new = XMALLOC (MTYPE_TMP, sizeof (struct rtadv)); - memset (new, 0, sizeof (struct rtadv)); - return new; + return XCALLOC (MTYPE_TMP, sizeof (struct rtadv)); } #if 0 @@ -531,12 +528,7 @@ rtadv_make_socket (void) static struct rtadv_prefix * rtadv_prefix_new () { - struct rtadv_prefix *new; - - new = XMALLOC (MTYPE_RTADV_PREFIX, sizeof (struct rtadv_prefix)); - memset (new, 0, sizeof (struct rtadv_prefix)); - - return new; + return XCALLOC (MTYPE_RTADV_PREFIX, sizeof (struct rtadv_prefix)); } static void |