From 8a97bddd0358698b14cd99a9fe465b6d8f79c48c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 31 Mar 2001 23:06:50 +0000 Subject: 2001-03-29 Neal H Walfield * create-bucket.c (ports_create_bucket): Include errno.h and stdlib.h. Do not include assert.h. Turn assertions into errors that set errno and return NULL. * create-class.c (ports_create_class): Likewise. --- libports/create-bucket.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'libports/create-bucket.c') diff --git a/libports/create-bucket.c b/libports/create-bucket.c index d523b788..9e25ab60 100644 --- a/libports/create-bucket.c +++ b/libports/create-bucket.c @@ -1,5 +1,5 @@ /* Create a port bucket - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2001 Free Software Foundation, Inc. Written by Michael I. Bushnell. This file is part of the GNU Hurd. @@ -19,7 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "ports.h" -#include +#include +#include #include #include @@ -30,14 +31,30 @@ ports_create_bucket () error_t err; ret = malloc (sizeof (struct port_bucket)); - assert (ret); + if (! ret) + { + errno = ENOMEM; + return NULL; + } err = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_PORT_SET, &ret->portset); - assert_perror (err); + if (err) + { + errno = err; + free (ret); + return NULL; + } err = ihash_create (&ret->htable); - assert_perror (err); + if (err) + { + errno = err; + mach_port_mod_refs (mach_task_self (), ret->portset, + MACH_PORT_RIGHT_PORT_SET, -1); + free (ret); + return NULL; + } ret->rpcs = ret->flags = ret->count = 0; -- cgit v1.2.3