summaryrefslogtreecommitdiffstats
path: root/src/H5Ocache.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-02-09 03:13:27 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-02-09 03:13:27 (GMT)
commit9c9ee2008c10801c11bce8563894d9a30ba9a959 (patch)
treec2b89df08fa3895d3fae1a4ad87353f9aabee598 /src/H5Ocache.c
parenteb0e5f8c4ea29e674c97a8be048814e26379d4c1 (diff)
downloadhdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.zip
hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.tar.gz
hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.tar.bz2
[svn-r21919] Description:
Refactor function name macros and simplify the FUNC_ENTER macros, to clear away the cruft and prepare for further cleanups. Tested on: Mac OSX/64 10.7.3 (amazon) w/debug, production & parallel
Diffstat (limited to 'src/H5Ocache.c')
-rw-r--r--src/H5Ocache.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index e64262b..2c33ebe 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -170,7 +170,7 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
haddr_t eoa; /* Relative end of file address */
H5O_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -374,7 +374,7 @@ H5O_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t UNUSED addr, H5O_t *
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -520,7 +520,7 @@ H5O_dest(H5F_t *f, H5O_t *oh)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -583,7 +583,7 @@ H5O_clear(H5F_t *f, H5O_t *oh, hbool_t destroy)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5O_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -650,7 +650,7 @@ done:
static herr_t
H5O_size(const H5F_t UNUSED *f, const H5O_t *oh, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(oh);
@@ -690,7 +690,7 @@ H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
uint8_t *buf; /* Buffer to decode */
H5O_chunk_proxy_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_cache_chk_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -783,7 +783,7 @@ H5O_cache_chk_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_cache_chk_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* flush */
if(chk_proxy->cache_info.is_dirty) {
@@ -829,7 +829,7 @@ H5O_cache_chk_dest(H5F_t *f, H5O_chunk_proxy_t *chk_proxy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_cache_chk_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(chk_proxy);
@@ -901,7 +901,7 @@ H5O_cache_chk_clear(H5F_t *f, H5O_chunk_proxy_t *chk_proxy, hbool_t destroy)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5O_cache_chk_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(chk_proxy);
@@ -952,7 +952,7 @@ done:
static herr_t
H5O_cache_chk_size(const H5F_t UNUSED *f, const H5O_chunk_proxy_t *chk_proxy, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cache_chk_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(chk_proxy);
@@ -986,7 +986,7 @@ H5O_add_cont_msg(H5O_cont_msgs_t *cont_msg_info, const H5O_cont_t *cont)
unsigned contno; /* Continuation message index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_add_cont_msg)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(cont_msg_info);
@@ -1042,7 +1042,7 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
#endif /* NDEBUG */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_chunk_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(oh);
@@ -1373,7 +1373,7 @@ H5O_chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_chunk_serialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -1436,7 +1436,7 @@ H5O_chunk_proxy_dest(H5O_chunk_proxy_t *chk_proxy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_chunk_proxy_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(chk_proxy);