summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-06-05 03:35:31 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-06-05 03:35:31 (GMT)
commita63ccc0c6b02c232744a35ed6fbb8c3708f7a3aa (patch)
treeb7002279b63d901703df372a765d07e8619c3457 /src
parent15f2fb818498d5c1c377041493382a29e0d71a45 (diff)
downloadhdf5-a63ccc0c6b02c232744a35ed6fbb8c3708f7a3aa.zip
hdf5-a63ccc0c6b02c232744a35ed6fbb8c3708f7a3aa.tar.gz
hdf5-a63ccc0c6b02c232744a35ed6fbb8c3708f7a3aa.tar.bz2
[svn-r409] Changes since 19980604
---------------------- ./html/Datatypes.html Updated documentation for named data types and type sharing. ./src/H5Farray.c Split a couple long lines. ./src/H5T.c The H5T_copy() demotes immutable types to read-only types so they're cleaned up properly and memory is not leaked. ./test/dtypes.c Modified to be more consistent with other tests. Removed all internal header files, constants, types, and functions calls since the API is now complete enough to test everything. Temporary files are now removed.
Diffstat (limited to 'src')
-rw-r--r--src/H5Farray.c10
-rw-r--r--src/H5T.c4
2 files changed, 9 insertions, 5 deletions
diff --git a/src/H5Farray.c b/src/H5Farray.c
index f882a9d..b74decb 100644
--- a/src/H5Farray.c
+++ b/src/H5Farray.c
@@ -153,11 +153,12 @@ H5F_arr_read (H5F_t *f, const struct H5O_layout_t *layout,
&& f->shared->access_parms->u.mpio.access_mode==H5D_XFER_COLLECTIVE);
if (is_collective){
#ifdef AKC
- printf("%s: collective read requested\n", FUNC);
+ printf("%s: collective read requested\n", FUNC);
#endif
if (layout->type != H5D_CONTIGUOUS)
HRETURN_ERROR (H5E_DATASET, H5E_READERROR, FAIL,
- "collective access on non-contiguous datasets not supported yet");
+ "collective access on non-contiguous datasets not "
+ "supported yet");
}
#endif
@@ -229,11 +230,12 @@ H5F_arr_read (H5F_t *f, const struct H5O_layout_t *layout,
MPI_Allreduce(&temp, &min, 1, MPI_UNSIGNED_LONG, MPI_MIN,
f->shared->access_parms->u.mpio.comm);
#ifdef AKC
-printf("nelmts=%lu, min=%lu, max=%lu\n", temp, min, max);
+ printf("nelmts=%lu, min=%lu, max=%lu\n", temp, min, max);
#endif
if (max != min)
HRETURN_ERROR(H5E_DATASET, H5E_READERROR, FAIL,
- "collective access with unequal number of blocks not supported yet");
+ "collective access with unequal number of "
+ "blocks not supported yet");
}
#endif
diff --git a/src/H5T.c b/src/H5T.c
index 1e10135..5f6b8ad 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -2874,10 +2874,12 @@ H5T_copy(const H5T_t *old_dt, H5T_copy_t method)
case H5T_COPY_ALL:
/*
* Return a transient type (locked or unlocked) or an unopened named
- * type.
+ * type. Immutable transient types are degraded to read-only.
*/
if (H5T_STATE_OPEN==new_dt->state) {
new_dt->state = H5T_STATE_NAMED;
+ } else if (H5T_STATE_IMMUTABLE==new_dt->state) {
+ new_dt->state = H5T_STATE_RDONLY;
}
break;