diff options
author | Robb Matzke <matzke@llnl.gov> | 1999-04-26 14:43:53 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1999-04-26 14:43:53 (GMT) |
commit | d6823ceb08328519d4ab0738abca997d0e433f37 (patch) | |
tree | cb81c5ece99d7ea8c85d13325737d0c3b847e6d8 /src/H5R.c | |
parent | e987b73f58ecea72d034ae39a70ad5d5c3bec9ab (diff) | |
download | hdf5-d6823ceb08328519d4ab0738abca997d0e433f37.zip hdf5-d6823ceb08328519d4ab0738abca997d0e433f37.tar.gz hdf5-d6823ceb08328519d4ab0738abca997d0e433f37.tar.bz2 |
[svn-r1217] Changes since 19990426
----------------------
./config/commence.in
./examples/Makefile.in
./test/Makefile.in
./testpar/Makefile.in
./tools/Makefile.in
Fixed some dependency problems in Makefiles. If the library
version is updated then everything gets recompiled.
./src/H5G.c
./src/H5R.c
Failure return value for object type functions is now
H5G_UNKNOWN as documented.
./src/H5Shyper.c
./src/H5Spoint.c
Fixed an unused argument warning.
./tools/h5debug.c
Fixed a call to H5F_block_read() since the 4th argument is
different now.
./tools/h5ls.c
Added a space between the object name and class to make the
output readable when the object name is longer than 24
characters.
C
Diffstat (limited to 'src/H5R.c')
-rw-r--r-- | src/H5R.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -671,7 +671,7 @@ H5R_get_object_type(H5D_t *dset, void *_ref) uint8_t *p; /* Pointer to OID to store */ intn ret_value = H5G_UNKNOWN; - FUNC_ENTER(H5R_get_object_type, FAIL); + FUNC_ENTER(H5R_get_object_type, H5G_UNKNOWN); assert(ref); assert(dset); @@ -719,16 +719,18 @@ int H5Rget_object_type(hid_t dataset, void *_ref) { H5D_t *dset = NULL; /* dataset object */ - hid_t ret_value = FAIL; + hid_t ret_value = H5G_UNKNOWN; - FUNC_ENTER(H5Rget_object_type, FAIL); + FUNC_ENTER(H5Rget_object_type, H5G_UNKNOWN); H5TRACE2("Is","ix",dataset,_ref); /* Check args */ - if (H5I_DATASET != H5I_get_type(dataset) || NULL == (dset = H5I_object(dataset))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset"); + if (H5I_DATASET != H5I_get_type(dataset) || + NULL == (dset = H5I_object(dataset))) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a dataset"); if(_ref==NULL) - HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer"); + HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, + "invalid reference pointer"); /* Get the object information */ ret_value=H5R_get_object_type(dset,_ref); |