summaryrefslogtreecommitdiffstats
path: root/src/H5Odtype.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-03-17 21:50:32 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-03-17 21:50:32 (GMT)
commit4494348eb229ae0661754c974695d8a293c6168b (patch)
treea5e98a61dbfc55ab9556a602ba3288ef33e2a1e4 /src/H5Odtype.c
parent31a709a6b24f4cf80f9cd99a3e55f56e81cf3066 (diff)
downloadhdf5-4494348eb229ae0661754c974695d8a293c6168b.zip
hdf5-4494348eb229ae0661754c974695d8a293c6168b.tar.gz
hdf5-4494348eb229ae0661754c974695d8a293c6168b.tar.bz2
[svn-r323] Changes since 19980316
---------------------- ./src/H5D.c ./src/H5T.c ./src/H5Tprivate.h Fixed a bug found by Kevin Powell regarding preservation of existing data during a read or write when the source and destination data types are the same. Thanks Kevin! Fixed a couple warnings on Irix64. ./src/H5D.c ./src/H5Dprivate.h ./src/H5P.c ./src/H5Ppublic.c ./src/H5Tconv.c ./src/H5Tpublic.h ./test/cmpd_dset.c The application can now turn on/off the part of the I/O pipeline that deals with preservation of initialized data. The default is off since this will be the usual case and turning it on slows down the pipe. Use H5Pset_preserve() and H5Pget_preserve(). ./src/H5Fistore.c Added an optimization for reading/writing a single chunk of chunked storage. ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Olayout.c ./src/H5Oname.c ./src/H5Osdspace.c ./src/H5Ostab.c Fixed warnings reported by marek@iiasa.ac.at. Thanks Marek. ./src/H5Odtype.c Fixed a failing assert() wrt reading compound types (not present in hdf5-1.0.0a).
Diffstat (limited to 'src/H5Odtype.c')
-rw-r--r--src/H5Odtype.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index e2a09a3..fe30d00 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -174,6 +174,7 @@ H5O_dtype_decode_helper(const uint8 **pp, H5T_t *dt)
dt->u.compnd.memb[i].perm[1] = (perm_word >> 8) & 0xff;
dt->u.compnd.memb[i].perm[2] = (perm_word >> 16) & 0xff;
dt->u.compnd.memb[i].perm[3] = (perm_word >> 24) & 0xff;
+ dt->u.compnd.memb[i].type = H5MM_xcalloc (1, sizeof(H5T_t));
if (H5O_dtype_decode_helper(pp, dt->u.compnd.memb[i].type) < 0 ||
H5T_COMPOUND == dt->u.compnd.memb[i].type->type) {
for (j = 0; j <= i; j++)
@@ -548,7 +549,7 @@ H5O_dtype_copy(const void *_src, void *_dst)
H5F_t *f; IN: pointer to the HDF5 file struct
const void *mesg; IN: Pointer to the source simple datatype struct
RETURNS
- Size of message on success, FAIL on failure
+ Size of message on success, 0 on failure
DESCRIPTION
This function returns the size of the raw simple datatype message on
success. (Not counting the message type or size fields, only the data
@@ -561,7 +562,7 @@ H5O_dtype_size(H5F_t *f, const void *mesg)
size_t ret_value = 8;
const H5T_t *dt = (const H5T_t *) mesg;
- FUNC_ENTER(H5O_dtype_size, FAIL);
+ FUNC_ENTER(H5O_dtype_size, 0);
assert(mesg);
@@ -728,7 +729,7 @@ H5O_dtype_debug(H5F_t *f, const void *mesg, FILE * stream,
}
fprintf(stream, "}\n");
}
- H5O_dtype_debug(f, &(dt->u.compnd.memb[i].type), stream,
+ H5O_dtype_debug(f, dt->u.compnd.memb[i].type, stream,
indent + 3, MAX(0, fwidth - 3));
}
} else {