diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-08-18 14:13:29 -0700 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2009-06-12 17:07:49 +0100 |
| commit | 393deb9bd663361e6b110d579a8b1d4c22667068 (patch) | |
| tree | e93ebf2f57bf92ff7a9cd045764b3cdbb99a07e5 /ripd | |
| parent | 3453a7122c1d585ad789ed0f63deb90cc5e89fae (diff) | |
[cleanup] Convert XMALLOC/memset to XCALLOC
Simple conversion of XMALLOC/memset to XCALLOC
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/rip_interface.c | 3 | ||||
| -rw-r--r-- | ripd/rip_offset.c | 6 | ||||
| -rw-r--r-- | ripd/rip_peer.c | 6 | ||||
| -rw-r--r-- | ripd/ripd.c | 16 |
4 files changed, 7 insertions, 24 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 7c5577b4..54d357ce 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -118,8 +118,7 @@ rip_interface_new (void) { struct rip_interface *ri; - ri = XMALLOC (MTYPE_RIP_INTERFACE, sizeof (struct rip_interface)); - memset (ri, 0, sizeof (struct rip_interface)); + ri = XCALLOC (MTYPE_RIP_INTERFACE, sizeof (struct rip_interface)); /* Default authentication type is simple password for Cisco compatibility. */ diff --git a/ripd/rip_offset.c b/ripd/rip_offset.c index e7d71f6c..0155f90e 100644 --- a/ripd/rip_offset.c +++ b/ripd/rip_offset.c @@ -63,11 +63,7 @@ strcmp_safe (const char *s1, const char *s2) static struct rip_offset_list * rip_offset_list_new (void) { - struct rip_offset_list *new; - - new = XMALLOC (MTYPE_RIP_OFFSET_LIST, sizeof (struct rip_offset_list)); - memset (new, 0, sizeof (struct rip_offset_list)); - return new; + return XCALLOC (MTYPE_RIP_OFFSET_LIST, sizeof (struct rip_offset_list)); } static void diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c index e0617890..fd912eba 100644 --- a/ripd/rip_peer.c +++ b/ripd/rip_peer.c @@ -36,11 +36,7 @@ struct list *peer_list; static struct rip_peer * rip_peer_new (void) { - struct rip_peer *new; - - new = XMALLOC (MTYPE_RIP_PEER, sizeof (struct rip_peer)); - memset (new, 0, sizeof (struct rip_peer)); - return new; + return XCALLOC (MTYPE_RIP_PEER, sizeof (struct rip_peer)); } static void diff --git a/ripd/ripd.c b/ripd/ripd.c index 2525679c..cb2603d0 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -110,13 +110,9 @@ rip_route_rte (struct rip_info *rinfo) } static struct rip_info * -rip_info_new () +rip_info_new (void) { - struct rip_info *new; - - new = XMALLOC (MTYPE_RIP_INFO, sizeof (struct rip_info)); - memset (new, 0, sizeof (struct rip_info)); - return new; + return XCALLOC (MTYPE_RIP_INFO, sizeof (struct rip_info)); } void @@ -2697,8 +2693,7 @@ rip_redistribute_withdraw (int type) static int rip_create (void) { - rip = XMALLOC (MTYPE_RIP, sizeof (struct rip)); - memset (rip, 0, sizeof (struct rip)); + rip = XCALLOC (MTYPE_RIP, sizeof (struct rip)); /* Set initial value. */ rip->version_send = RI_RIP_VERSION_2; @@ -3117,10 +3112,7 @@ struct rip_distance static struct rip_distance * rip_distance_new (void) { - struct rip_distance *new; - new = XMALLOC (MTYPE_RIP_DISTANCE, sizeof (struct rip_distance)); - memset (new, 0, sizeof (struct rip_distance)); - return new; + return XCALLOC (MTYPE_RIP_DISTANCE, sizeof (struct rip_distance)); } static void |