diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2002-08-08 16:52:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2002-08-08 16:52:55 (GMT) |
| commit | d8397a6f426227d09d20e647ce8b12b8c6295b2d (patch) | |
| tree | 2943fbfd2bfb66cf167eb642835fdb4deb3afd3c /src/H5Ocont.c | |
| parent | 573307786a1f5f7ce597e5191ea08c3bbd95b66c (diff) | |
| download | hdf5-d8397a6f426227d09d20e647ce8b12b8c6295b2d.zip hdf5-d8397a6f426227d09d20e647ce8b12b8c6295b2d.tar.gz hdf5-d8397a6f426227d09d20e647ce8b12b8c6295b2d.tar.bz2 | |
[svn-r5842] Purpose:
Code cleanup
Description:
Change most (all?) HRETURN_ERROR macros to HGOTO_ERROR macros, along with
HRETURN macros to HGOTO_DONE macros. This unifies the error return path
from functions and reduces the size of the library by up to 10% on some
platforms.
Additionally, I improved a lot of the error cleanup code in many routines.
Platforms tested:
FreeBSD 4.6 (sleipnir) serial & parallel and IRIX64 6.5 (modi4) serial &
parallel.
Diffstat (limited to 'src/H5Ocont.c')
| -rw-r--r-- | src/H5Ocont.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/H5Ocont.c b/src/H5Ocont.c index c79f01e..95e9ff9 100644 --- a/src/H5Ocont.c +++ b/src/H5Ocont.c @@ -72,6 +72,7 @@ static void * H5O_cont_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) { H5O_cont_t *cont = NULL; + void *ret_value; FUNC_ENTER_NOAPI(H5O_cont_decode, NULL); @@ -81,15 +82,18 @@ H5O_cont_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) assert (!sh); /* decode */ - if (NULL==(cont = H5MM_calloc(sizeof(H5O_cont_t)))) { - HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, - "memory allocation failed"); - } + if (NULL==(cont = H5MM_calloc(sizeof(H5O_cont_t)))) + HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); H5F_addr_decode(f, &p, &(cont->addr)); H5F_DECODE_LENGTH(f, p, cont->size); - FUNC_LEAVE((void *) cont); + /* Set return value */ + ret_value=cont; + +done: + FUNC_LEAVE(ret_value); } + /*------------------------------------------------------------------------- * Function: H5O_cont_encode @@ -124,6 +128,7 @@ H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg) FUNC_LEAVE(SUCCEED); } + /*------------------------------------------------------------------------- * Function: H5O_cont_debug |