diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5G.c | 4 | ||||
| -rw-r--r-- | src/H5R.c | 14 | ||||
| -rw-r--r-- | src/H5Shyper.c | 3 | ||||
| -rw-r--r-- | src/H5Spoint.c | 3 |
4 files changed, 14 insertions, 10 deletions
@@ -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); @@ -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); |