diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-18 21:26:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-18 21:26:01 (GMT) |
| commit | 68980389d9974d96edaa7fe417344670a21ef963 (patch) | |
| tree | a4c2a38cae1358db5481dee7705011570f00e9f4 /src/H5Znbit.c | |
| parent | 59748607b2b42a9b7aaaf24314df0760cb35a06b (diff) | |
| download | hdf5-68980389d9974d96edaa7fe417344670a21ef963.zip hdf5-68980389d9974d96edaa7fe417344670a21ef963.tar.gz hdf5-68980389d9974d96edaa7fe417344670a21ef963.tar.bz2 | |
[svn-r15237] Description:
Merge revisions 14900:15037 from trunk into metadata journaling branch
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.5.2 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Znbit.c')
| -rw-r--r-- | src/H5Znbit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/H5Znbit.c b/src/H5Znbit.c index 1b9265d..2423654 100644 --- a/src/H5Znbit.c +++ b/src/H5Znbit.c @@ -439,7 +439,7 @@ H5Z_set_parms_atomic(const H5T_t *type, unsigned cd_values[]) int dtype_offset; /* Atomic datatype's offset (in bits) */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5Z_set_parms_atomic, FAIL) + FUNC_ENTER_NOAPI_NOINIT(H5Z_set_parms_atomic) /* Set datatype class code */ cd_values[cd_values_index++] = H5Z_NBIT_ATOMIC; @@ -799,6 +799,7 @@ H5Z_set_local_nbit(hid_t dcpl_id, hid_t type_id, hid_t space_id) /* Get total number of elements in the chunk */ if((npoints = H5S_GET_EXTENT_NPOINTS(ds)) < 0) HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get number of points in the dataspace") + HDassert(npoints); /* Initialize index for cd_values array starting from the third entry */ cd_values_index = 2; |