summaryrefslogtreecommitdiffstats
path: root/src/H5D.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-10-26 14:49:52 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-10-26 14:49:52 (GMT)
commitdb9525c2a3ee70379032bae71f26866451df7e58 (patch)
tree81d4f205bbe5c1b201d4be648d04d420dc297cf8 /src/H5D.c
parent7f020a4f3ce07a105881240d1cabd3a16bd518a0 (diff)
downloadhdf5-db9525c2a3ee70379032bae71f26866451df7e58.zip
hdf5-db9525c2a3ee70379032bae71f26866451df7e58.tar.gz
hdf5-db9525c2a3ee70379032bae71f26866451df7e58.tar.bz2
[svn-r789] Changes since 19981023
---------------------- ./MANIFEST ./test/Makefile.in ./test/flush1.c [NEW] ./test/flush2.c [NEW] Test to see if calling H5Fflush() results in a consistent file. ./src/H5.c ./src/H5A.c ./src/H5D.c ./src/H5Fistore.c ./src/H5I.c ./src/H5S.c ./src/H5Shyper.c ./src/H5Sselect.c ./src/H5TB.c Changed comparisons against SUCCEED and FAIL to >=0 and <0 in about 15 places. ./src/H5.c ./src/H5V.c ./src/H5detect.c ./src/H5private.h ./src/H5public.h ./test/big.c ./test/chunk.c ./test/cmpd_dset.c ./test/dsets.c ./test/dtypes.c ./test/external.c ./test/fillval.c ./test/iopipe.c ./test/links.c ./test/mount.c ./test/mtime.c ./test/ragged.c ./test/shtype.c ./test/unlink.c Removed ^M from the end of lines inserted on broken OS's ;-) ./src/H5private.h Changed c++ comments to c comments. ./src/H5R.c Added tracing macros.
Diffstat (limited to 'src/H5D.c')
-rw-r--r--src/H5D.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/H5D.c b/src/H5D.c
index f7bc440..d37b3eb 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1297,7 +1297,7 @@ H5D_open_oid(H5D_t *dataset, H5G_entry_t *ent)
done:
if (space)
H5S_close (space);
- if (ret_value==FAIL && dataset) {
+ if (ret_value<0 && dataset) {
if (H5F_addr_defined(&(dataset->ent.header))) {
H5O_close(&(dataset->ent));
}
@@ -1586,16 +1586,15 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
}
if (NULL==(tconv_buf=xfer_parms->tconv_buf)) {
/* Allocate temporary buffer */
- if (FAIL==(tconv_id = H5TB_get_buf(target_size, 1,
- (void **)&tconv_buf))) {
+ if ((tconv_id = H5TB_get_buf(target_size, 1, (void **)&tconv_buf))<0) {
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
"memory allocation failed for type conversion");
}
}
if (need_bkg && NULL==(bkg_buf=xfer_parms->bkg_buf)) {
/* Allocate temporary buffer */
- if (FAIL==(bkg_id = H5TB_get_buf(request_nelmts*dst_type_size, 1,
- (void **)&bkg_buf))) {
+ if ((bkg_id=H5TB_get_buf(request_nelmts*dst_type_size, 1,
+ (void **)&bkg_buf))<0) {
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
"memory allocation failed for type conversion");
}
@@ -1960,16 +1959,15 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
}
if (NULL==(tconv_buf=xfer_parms->tconv_buf)) {
/* Allocate temporary buffer */
- if (FAIL==(tconv_id = H5TB_get_buf(target_size, 1,
- (void **)&tconv_buf))) {
+ if ((tconv_id=H5TB_get_buf(target_size, 1, (void **)&tconv_buf))<0) {
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
"memory allocation failed for type conversion");
}
}
if (need_bkg && NULL==(bkg_buf=xfer_parms->bkg_buf)) {
/* Allocate temporary buffer */
- if (FAIL==(bkg_id = H5TB_get_buf(request_nelmts*dst_type_size, 1,
- (void **)&bkg_buf))) {
+ if ((bkg_id=H5TB_get_buf(request_nelmts*dst_type_size, 1,
+ (void **)&bkg_buf))<0) {
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
"memory allocation failed for type conversion");
}