From dff1653a4f36ded37ed426277068d3db53aa4be2 Mon Sep 17 00:00:00 2001 From: James Laird Date: Wed, 29 Sep 2004 10:28:25 -0500 Subject: [svn-r9335] Purpose: Bug fix Description: Fix bugs found by daily tests. Platforms tested: copper --- src/H5Distore.c | 2 +- src/H5G.c | 2 +- src/H5R.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/H5Distore.c b/src/H5Distore.c index 172a29b..e670ef7 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -2104,7 +2104,7 @@ HDfprintf(stderr,"%s: mem_offset_arr[%Zu]=%Hu\n",FUNC,*mem_curr_seq,mem_offset_a || (IS_H5FD_MPI(f) && (H5F_ACC_RDWR & H5F_get_intent(f)))) { #ifdef H5_HAVE_PARALLEL /* Additional sanity check when operating in parallel */ - if (chunk_addr==HADDR_UNDEF || dset->dcpl_cache.pline.nused>0) + if (chunk_addr==HADDR_UNDEF || dset->shared->dcpl_cache.pline.nused>0) HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "unable to locate raw data chunk"); #endif /* H5_HAVE_PARALLEL */ if ((ret_value=H5D_contig_writevv(f, dxpl_id, dset, chunk_addr, (hsize_t)dset->shared->layout.u.chunk.size, chunk_max_nseq, chunk_curr_seq, chunk_len_arr, chunk_offset_arr, mem_max_nseq, mem_curr_seq, mem_len_arr, mem_offset_arr, buf))<0) diff --git a/src/H5G.c b/src/H5G.c index e78a457..6857244 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -303,7 +303,7 @@ H5Gopen(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found"); /* Open the group */ - if ((grp = H5G_open(&ent, dxpl_id)) <0) + if ((grp = H5G_open(&ent, dxpl_id)) ==NULL) HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group"); /* Register an atom for the group */ diff --git a/src/H5R.c b/src/H5R.c index c92c3dd..f23afa4 100644 --- a/src/H5R.c +++ b/src/H5R.c @@ -416,7 +416,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref) break; case H5G_TYPE: - if ((type=H5T_open(&ent, dxpl_id))<0) + if ((type=H5T_open(&ent, dxpl_id)) ==NULL) HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "not found"); /* Create an atom for the datatype */ @@ -428,7 +428,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref) case H5G_DATASET: /* Open the dataset */ - if ((dset=H5D_open(&ent,dxpl_id)) <0) + if ((dset=H5D_open(&ent,dxpl_id)) ==NULL) HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found"); /* Create an atom for the dataset */ -- cgit v0.12