summaryrefslogtreecommitdiffstats
path: root/src/H5D.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-07-28 19:37:35 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-07-28 19:37:35 (GMT)
commit2681ce4a86ca3c6400ba242bc336d23c77753ff5 (patch)
treef4cb88dcd07675a7a4c76141a080148cee1eabc7 /src/H5D.c
parente4834c43ce6528308ebd5375bd4c7a0df88af427 (diff)
downloadhdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.zip
hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.gz
hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.bz2
[svn-r1549] Changes since 19990728
---------------------- ./src/H5B.c [1.3] ./src/H5D.c [1.3] ./src/H5F.c [1.3] ./src/H5Farray.c [1.3] ./src/H5Fcore.c [1.3] ./src/H5Ffamily.c [1.3] ./src/H5Fistore.c [1.3] ./src/H5Flow.c [1.3] ./src/H5Fmpio.c [1.3] ./src/H5Fprivate.h [1.3] ./src/H5Fsplit.c [1.3] ./src/H5Fstdio.c [1.3] ./src/H5G.c [1.3] ./src/H5HG.c [1.3] ./src/H5HL.c [1.3] ./src/H5MF.c [1.3] ./src/H5O.c [1.3] ./src/H5Odtype.c [1.3] ./src/H5Oefl.c [1.3] ./src/H5P.c [1.3] ./src/H5Smpio.c [1.3] ./src/H5T.c [1.3] ./src/H5detect.c [1.3] ./tools/h5debug.c [1.3] Some of the H5F_addr_* functions were optimized away. ./src/H5D.c [1.3] Fixed the return values from NULL to FAIL on one MPI-IO function.
Diffstat (limited to 'src/H5D.c')
-rw-r--r--src/H5D.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5D.c b/src/H5D.c
index b2fe696..af8b74d 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -819,7 +819,7 @@ H5D_new(const H5D_create_t *create_parms)
ret_value->create_parms = H5P_copy (H5P_DATASET_CREATE,
&H5D_create_dflt);
}
- H5F_addr_undef(&(ret_value->ent.header));
+ ret_value->ent.header = H5F_ADDR_UNDEF;
/* Success */
@@ -1039,7 +1039,7 @@ H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type,
"unable to initialize storage");
}
} else {
- H5F_addr_undef (&(new_dset->layout.addr));
+ new_dset->layout.addr = H5F_ADDR_UNDEF;
}
/* Update layout message */
@@ -1870,7 +1870,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
/* support parallel access of that yet */
if (H5F_LOW_MPIO==dataset->ent.file->shared->access_parms->driver &&
H5T_get_class(mem_type)==H5T_VLEN) {
- HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, NULL,
+ HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"Parallel IO does not support writing VL datatypes yet");
}
#endif
@@ -1881,7 +1881,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
if (H5F_LOW_MPIO==dataset->ent.file->shared->access_parms->driver &&
H5T_get_class(mem_type)==H5T_REFERENCE &&
H5T_get_ref_type(mem_type)==H5R_DATASET_REGION) {
- HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, NULL,
+ HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"Parallel IO does not support writing VL datatypes yet");
}
#endif
@@ -2443,7 +2443,7 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
H5V_array_fill(buf, dset->create_parms->fill.buf,
dset->create_parms->fill.size, ptsperbuf);
if (dset->create_parms->efl.nused) {
- H5F_addr_reset(&addr);
+ addr = 0;
} else {
addr = dset->layout.addr;
}
@@ -2465,7 +2465,7 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
}
}
npoints -= MIN(ptsperbuf, npoints);
- H5F_addr_inc(&addr, size);
+ addr += size;
}
} else if (dset->create_parms->fill.buf) {
/*