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/H5Zszip.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/H5Zszip.c')
| -rw-r--r-- | src/H5Zszip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Zszip.c b/src/H5Zszip.c index 52f5e11..fd3d90c 100644 --- a/src/H5Zszip.c +++ b/src/H5Zszip.c @@ -84,7 +84,7 @@ H5Z_can_apply_szip(hid_t UNUSED dcpl_id, hid_t type_id, hid_t UNUSED space_id) H5T_order_t dtype_order; /* Datatype's endianness order */ htri_t ret_value = TRUE; /* Return value */ - FUNC_ENTER_NOAPI(H5Z_can_apply_szip, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Get datatype */ if(NULL == (type = H5I_object_verify(type_id, H5I_DATATYPE))) @@ -151,7 +151,7 @@ H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id) hsize_t scanline; /* Size of dataspace's fastest changing dimension */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5Z_set_local_szip, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Get the plist structure */ if(NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE))) @@ -284,7 +284,7 @@ H5Z_filter_szip (unsigned flags, size_t cd_nelmts, const unsigned cd_values[], unsigned char *newbuf = NULL; /* Pointer to input buffer */ SZ_com_t sz_param; /* szip parameter block */ - FUNC_ENTER_NOAPI(H5Z_filter_szip, 0) + FUNC_ENTER_NOAPI(0) /* Sanity check to make certain that we haven't drifted out of date with * the mask options from the szlib.h header */ |