summaryrefslogtreecommitdiffstats
path: root/src/H5Ocont.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-10-26 20:09:29 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-10-26 20:09:29 (GMT)
commited6e5dd6dcde54d16569fc28f8b062bac81fb81a (patch)
tree3a131d220d13a6e68f4cd3f7971befbda91d723d /src/H5Ocont.c
parentacab18c8ded316c7c22680757fd55b2b2d3745d3 (diff)
downloadhdf5-ed6e5dd6dcde54d16569fc28f8b062bac81fb81a.zip
hdf5-ed6e5dd6dcde54d16569fc28f8b062bac81fb81a.tar.gz
hdf5-ed6e5dd6dcde54d16569fc28f8b062bac81fb81a.tar.bz2
[svn-r9460] Purpose:
Code cleanup & optimization Description: Bring back new metadata cache code from development branch. Platforms tested: FreeBSD 4.10 (sleipnir) w/parallel Solaris 2.7 (arabica) Linux 2.4 (heping) w/C++ & FORTRAN
Diffstat (limited to 'src/H5Ocont.c')
-rw-r--r--src/H5Ocont.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index e8dca5b..1058b37 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -88,7 +88,7 @@ H5O_cont_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t U
H5O_cont_t *cont = NULL;
void *ret_value;
- FUNC_ENTER_NOAPI(H5O_cont_decode, NULL);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_cont_decode);
/* check args */
assert(f);
@@ -128,9 +128,8 @@ static herr_t
H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg)
{
const H5O_cont_t *cont = (const H5O_cont_t *) _mesg;
- herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_cont_encode, FAIL);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_encode);
/* check args */
assert(f);
@@ -141,8 +140,7 @@ H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg)
H5F_addr_encode(f, &p, cont->addr);
H5F_ENCODE_LENGTH(f, p, cont->size);
-done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -166,9 +164,8 @@ H5O_cont_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
int indent, int fwidth)
{
const H5O_cont_t *cont = (const H5O_cont_t *) _mesg;
- herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_cont_debug, FAIL);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_debug);
/* check args */
assert(f);
@@ -187,6 +184,5 @@ H5O_cont_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
"Points to chunk number:",
(int) (cont->chunkno));
-done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}