summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-06-07 15:05:02 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-06-07 15:05:02 (GMT)
commitb98fcbf5926e81f2e4ead8daa46e650566719e1c (patch)
tree1653e8084aff321512fb2d2bc842573fef62f220 /src
parent2a10e682a13244d5c61982445f2d6ec5bc990a36 (diff)
downloadhdf5-b98fcbf5926e81f2e4ead8daa46e650566719e1c.zip
hdf5-b98fcbf5926e81f2e4ead8daa46e650566719e1c.tar.gz
hdf5-b98fcbf5926e81f2e4ead8daa46e650566719e1c.tar.bz2
[svn-r1306] Changes since 19990602
---------------------- ./doc/html/Datatypes.html ./test/dtypes.c Added documentation and tests for opaque types. ./tools/h5ls.c Added a `-x' or `--hexdump' argument which is not fully implemented (because I want to synchronize h5tools.c first) but which will eventually print raw data in hexadecimal format without any translation from disk. This would be useful for debugging references and VL types. ./tools/h5tools.c Added support for references (not quite finished yet, but compiles -- I wanted to sync up this file before Patrick and I got too far apart...) ./src/H5R.c Checked for error return value from H5R_get_object_type() ./src/H5A.c ./src/H5D.c Changed error return values from NULL to FAIL ./test/Makefile.in ./test/trefer.c Creates trefer1.h5 and trefer2.h5 so that the second test doesn't clobber the first file since the files might be useful for debugging.
Diffstat (limited to 'src')
-rw-r--r--src/H5A.c5
-rw-r--r--src/H5D.c5
-rw-r--r--src/H5R.c7
3 files changed, 11 insertions, 6 deletions
diff --git a/src/H5A.c b/src/H5A.c
index 275c350..2397b2a 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -963,8 +963,9 @@ H5Aget_type(hid_t attr_id)
}
/* Mark any VL datatypes as being in memory now */
if(H5T_get_class(dst)==H5T_VLEN) {
- if (H5T_vlen_set_loc(dst, NULL, H5T_VLEN_MEMORY)<0) {
- HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid VL location");
+ if (H5T_vlen_set_loc(dst, NULL, H5T_VLEN_MEMORY)<0) {
+ HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+ "invalid VL location");
}
}
if (H5T_lock(dst, FALSE)<0) {
diff --git a/src/H5D.c b/src/H5D.c
index 614bda6..d84a856 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -459,8 +459,9 @@ H5Dget_type(hid_t dset_id)
}
/* Mark any VL datatypes as being in memory now */
if(H5T_get_class(copied_type)==H5T_VLEN) {
- if (H5T_vlen_set_loc(copied_type, NULL, H5T_VLEN_MEMORY)<0) {
- HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid VL location");
+ if (H5T_vlen_set_loc(copied_type, NULL, H5T_VLEN_MEMORY)<0) {
+ HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+ "invalid VL location");
}
}
if (H5T_lock (copied_type, FALSE)<0) {
diff --git a/src/H5R.c b/src/H5R.c
index 274b69f..6535ebf 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -733,8 +733,11 @@ H5Rget_object_type(hid_t dataset, void *_ref)
"invalid reference pointer");
/* Get the object information */
- ret_value=H5R_get_object_type(dset,_ref);
-
+ if ((ret_value=H5R_get_object_type(dset,_ref))<0) {
+ HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN,
+ "unable to determine object type");
+ }
+
done:
FUNC_LEAVE(ret_value);
} /* end H5Rget_object_type() */