diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
| commit | eb89d7b53ab95623ab454186a602e1cafc7391f0 (patch) | |
| tree | ceafe458b3011e38853e765352d3c7e59bbecce1 /src/H5MFsection.c | |
| parent | 3e468e6ff65d540a439e99ea568a6bff7add7cea (diff) | |
| download | hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.zip hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.gz hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.bz2 | |
[svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously. The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'src/H5MFsection.c')
| -rw-r--r-- | src/H5MFsection.c | 18 |
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))) |