From aac372f4f5b617a579dafeab31fb486a5d69d65d Mon Sep 17 00:00:00 2001 From: hasso Date: Thu, 1 Sep 2005 17:52:33 +0000 Subject: * isis_adjacency.c, isis_lsp.c, isisd.c: Replace XMALLOC && memset with XCALLOC. * isis_lsp.c (lsp_build_pseudo): Fix adding ES neighbour. * isis_tlv.c: More compact free_tlvs() function. * isis_lsp.c (lsp_build_nonpseudo) : Try to fix one more regression introduced by stream cleanup. Seek enp to the right place before starting to fill stream with TLVs. --- isisd/isisd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'isisd/isisd.c') diff --git a/isisd/isisd.c b/isisd/isisd.c index 5ab1f272..e6679cf3 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -65,8 +65,7 @@ extern struct thread_master *master; void isis_new (unsigned long process_id) { - isis = XMALLOC (MTYPE_ISIS, sizeof (struct isis)); - bzero (isis, sizeof (struct isis)); + isis = XCALLOC (MTYPE_ISIS, sizeof (struct isis)); /* * Default values */ @@ -91,8 +90,7 @@ isis_area_create () { struct isis_area *area; - area = XMALLOC (MTYPE_ISIS_AREA, sizeof (struct isis_area)); - memset (area, 0, sizeof (struct isis_area)); + area = XCALLOC (MTYPE_ISIS_AREA, sizeof (struct isis_area)); /* * The first instance is level-1-2 rest are level-1, unless otherwise -- cgit v1.2.1