summaryrefslogtreecommitdiffstats
path: root/src/H5MFsection.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/H5MFsection.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/H5MFsection.c')
-rw-r--r--src/H5MFsection.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5MFsection.c b/src/H5MFsection.c
index 3f011ec..89b2219 100644
--- a/src/H5MFsection.c
+++ b/src/H5MFsection.c
@@ -134,7 +134,7 @@ H5MF_sect_simple_new(haddr_t sect_off, hsize_t sect_size)
H5MF_free_section_t *sect = NULL; /* 'Simple' free space section to add */
H5MF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_new)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect_size);
@@ -180,7 +180,7 @@ H5MF_sect_simple_deserialize(const H5FS_section_class_t UNUSED *cls,
H5MF_free_section_t *sect; /* New section */
H5FS_section_info_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(H5F_addr_defined(sect_addr));
@@ -221,7 +221,7 @@ H5MF_sect_simple_can_merge(const H5FS_section_info_t *_sect1,
const H5MF_free_section_t *sect2 = (const H5MF_free_section_t *)_sect2; /* File free section */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MF_sect_simple_can_merge)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect1);
@@ -259,7 +259,7 @@ H5MF_sect_simple_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
H5MF_free_section_t *sect2 = (H5MF_free_section_t *)_sect2; /* File free section */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_merge)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect1);
@@ -302,7 +302,7 @@ H5MF_sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
haddr_t end; /* End of section to extend */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_can_shrink)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@@ -395,7 +395,7 @@ H5MF_sect_simple_shrink(H5FS_section_info_t **_sect, void *_udata)
H5MF_sect_ud_t *udata = (H5MF_sect_ud_t *)_udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_shrink)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@@ -453,7 +453,7 @@ H5MF_sect_simple_free(H5FS_section_info_t *_sect)
{
H5MF_free_section_t *sect = (H5MF_free_section_t *)_sect; /* File free section */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MF_sect_simple_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect);
@@ -490,7 +490,7 @@ H5MF_sect_simple_valid(const H5FS_section_class_t UNUSED *cls,
const H5MF_free_section_t *sect = (const H5MF_free_section_t *)_sect; /* File free section */
#endif /* NDEBUG */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MF_sect_simple_valid)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect);
@@ -517,7 +517,7 @@ H5MF_sect_simple_split(H5FS_section_info_t *sect, hsize_t frag_size)
{
H5MF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_split)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate space for new section */
if(NULL == (ret_value = H5MF_sect_simple_new(sect->addr, frag_size)))