summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-04-26 14:43:53 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-04-26 14:43:53 (GMT)
commitd6823ceb08328519d4ab0738abca997d0e433f37 (patch)
treecb81c5ece99d7ea8c85d13325737d0c3b847e6d8 /src
parente987b73f58ecea72d034ae39a70ad5d5c3bec9ab (diff)
downloadhdf5-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')
-rw-r--r--src/H5G.c4
-rw-r--r--src/H5R.c14
-rw-r--r--src/H5Shyper.c3
-rw-r--r--src/H5Spoint.c3
4 files changed, 14 insertions, 10 deletions
diff --git a/src/H5G.c b/src/H5G.c
index 5250bf2..003bcc5 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -1991,7 +1991,7 @@ H5G_get_type(H5G_entry_t *ent)
for (i=H5G_ntypes_g; i>0; --i) {
if ((isa=(H5G_type_g[i-1].isa)(ent))<0) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
+ HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, H5G_UNKNOWN,
"unable to determine object type");
} else if (isa) {
HRETURN(H5G_type_g[i-1].type);
@@ -1999,7 +1999,7 @@ H5G_get_type(H5G_entry_t *ent)
}
if (0==i) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
+ HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, H5G_UNKNOWN,
"unable to determine object type");
}
FUNC_LEAVE(H5G_UNKNOWN);
diff --git a/src/H5R.c b/src/H5R.c
index c0a412c..1ed1632 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -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);
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 3e4df79..f5ec498 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -114,7 +114,8 @@ static const hssize_t zero[H5O_LAYOUT_NDIMS]={0}; /* Array of zeros */
*/
static herr_t
H5S_hyper_init (const struct H5O_layout_t UNUSED *layout,
- const H5S_t *space, H5S_sel_iter_t *sel_iter, size_t *min_elem_out)
+ const H5S_t *space, H5S_sel_iter_t *sel_iter,
+ size_t UNUSED *min_elem_out)
{
FUNC_ENTER (H5S_hyper_init, FAIL);
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 7d8672a..dfdfa03 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -83,7 +83,8 @@ const H5S_mconv_t H5S_POINT_MCONV[1] = {{
*/
static herr_t
H5S_point_init (const struct H5O_layout_t UNUSED *layout,
- const H5S_t *space, H5S_sel_iter_t *sel_iter, size_t *min_elem_out)
+ const H5S_t *space, H5S_sel_iter_t *sel_iter,
+ size_t UNUSED *min_elem_out)
{
FUNC_ENTER (H5S_point_init, FAIL);