diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-09 03:13:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-09 03:13:27 (GMT) |
| commit | 9c9ee2008c10801c11bce8563894d9a30ba9a959 (patch) | |
| tree | c2b89df08fa3895d3fae1a4ad87353f9aabee598 /src/H5SMmessage.c | |
| parent | eb0e5f8c4ea29e674c97a8be048814e26379d4c1 (diff) | |
| download | hdf5-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/H5SMmessage.c')
| -rw-r--r-- | src/H5SMmessage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5SMmessage.c b/src/H5SMmessage.c index 237e247..a9a58a4 100644 --- a/src/H5SMmessage.c +++ b/src/H5SMmessage.c @@ -92,7 +92,7 @@ H5SM_compare_cb(const void *obj, size_t obj_len, void *_udata) { H5SM_compare_udata_t *udata = (H5SM_compare_udata_t *)_udata; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_compare_cb) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* If the encoding sizes are different, it's not the same object */ if(udata->key->encoding_size > obj_len) @@ -130,7 +130,7 @@ H5SM_compare_iter_op(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence, H5SM_compare_udata_t *udata = (H5SM_compare_udata_t *) _udata; herr_t ret_value = H5_ITER_CONT; - FUNC_ENTER_NOAPI_NOINIT(H5SM_compare_iter_op) + FUNC_ENTER_NOAPI_NOINIT /* * Check arguments. @@ -192,7 +192,7 @@ H5SM_message_compare(const void *rec1, const void *rec2) const H5SM_sohm_t *mesg = (const H5SM_sohm_t *) rec2; herr_t ret_value = 0; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_message_compare) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* If the key has an fheap ID, we're looking for a message that's * already in the index; if the fheap ID matches, we've found the message @@ -291,7 +291,7 @@ H5SM_message_encode(uint8_t *raw, const void *_nrecord, void *_ctx) H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */ const H5SM_sohm_t *message = (const H5SM_sohm_t *)_nrecord; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_message_encode) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity check */ HDassert(ctx); @@ -335,7 +335,7 @@ H5SM_message_decode(const uint8_t *raw, void *_nrecord, void *_ctx) H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */ H5SM_sohm_t *message = (H5SM_sohm_t *)_nrecord; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_message_decode) + FUNC_ENTER_NOAPI_NOINIT_NOERR message->location = (H5SM_storage_loc_t)*raw++; UINT32DECODE(raw, message->hash); |