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/H5Dfill.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/H5Dfill.c')
| -rw-r--r-- | src/H5Dfill.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Dfill.c b/src/H5Dfill.c index a80dd83..c0a9766 100644 --- a/src/H5Dfill.c +++ b/src/H5Dfill.c @@ -117,7 +117,7 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_ H5T_t *buf_type; /* Buffer datatype */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Dfill, FAIL) + FUNC_ENTER_API(FAIL) H5TRACE5("e", "*xi*xii", fill, fill_type_id, buf, buf_type_id, space_id); /* Check args */ @@ -181,7 +181,7 @@ H5D_fill(const void *fill, const H5T_t *fill_type, void *buf, size_t dst_type_size; /* Size of destination type*/ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5D_fill) + FUNC_ENTER_NOAPI_NOINIT /* Check args */ HDassert(fill_type); @@ -370,7 +370,7 @@ H5D_fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5D_fill_init, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Check args */ HDassert(fb_info); @@ -566,7 +566,7 @@ H5D_fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts, hid_t dxpl_id) herr_t ret_value = SUCCEED; /* Return value */ void * buf = NULL; /* Temporary fill buffer */ - FUNC_ENTER_NOAPI(H5D_fill_refill_vl, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Check args */ HDassert(fb_info); @@ -644,7 +644,7 @@ done: herr_t H5D_fill_release(H5D_fill_buf_info_t *fb_info) { - FUNC_ENTER_NOAPI_NOFUNC(H5D_fill_release) + FUNC_ENTER_NOAPI_NOERR /* Check args */ HDassert(fb_info); @@ -682,7 +682,7 @@ H5D_fill_release(H5D_fill_buf_info_t *fb_info) herr_t H5D_fill_term(H5D_fill_buf_info_t *fb_info) { - FUNC_ENTER_NOAPI_NOFUNC(H5D_fill_term) + FUNC_ENTER_NOAPI_NOERR /* Check args */ HDassert(fb_info); |