diff options
| -rw-r--r-- | src/H5R.c | 18 | ||||
| -rw-r--r-- | test/dsets.c | 18 |
2 files changed, 17 insertions, 19 deletions
@@ -40,7 +40,7 @@ static herr_t H5R_create(void *ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type, H5S_t *space, hid_t dxpl_id); static hid_t H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref); static H5S_t * H5R_get_region(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref); -static int H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref); +static H5G_obj_t H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref); /*-------------------------------------------------------------------------- @@ -337,7 +337,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref) H5T_t *datatype; /* Pointer to datatype to open */ H5G_entry_t ent; /* Symbol table entry */ uint8_t *p; /* Pointer to OID to store */ - int oid_type; /* type of object being dereferenced */ + H5G_obj_t oid_type; /* type of object being dereferenced */ hid_t ret_value; FUNC_ENTER_NOINIT(H5R_dereference); @@ -647,13 +647,13 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static int -H5R_get_object_type(H5F_t *file, hid_t dxpl_id, void *_ref) +static H5G_obj_t +H5R_get_object_type(H5F_t *file, void *_ref) { H5G_entry_t ent; /* Symbol table entry */ hobj_ref_t *ref=(hobj_ref_t *)_ref; /* Only object references currently supported */ uint8_t *p; /* Pointer to OID to store */ - int ret_value; + H5G_obj_t ret_value; FUNC_ENTER_NOINIT(H5R_get_object_type); @@ -670,7 +670,7 @@ H5R_get_object_type(H5F_t *file, hid_t dxpl_id, void *_ref) H5F_addr_decode(ent.file,(const uint8_t **)&p,&(ent.header)); /* Get the OID type */ - ret_value=H5G_get_type(&ent, dxpl_id); + ret_value=H5G_get_type(&ent, H5P_DEFAULT); #ifdef LATER done: @@ -721,7 +721,7 @@ H5Rget_object_type(hid_t id, void *_ref) file=loc->file; /* Get the object information */ - if ((ret_value=H5R_get_object_type(file,H5AC_ind_dxpl_id,_ref))<0) + if ((ret_value=H5R_get_object_type(file,_ref))<0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type"); done: @@ -752,12 +752,12 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static int +static H5G_obj_t H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref) { H5G_entry_t ent; /* Symbol table entry */ uint8_t *p; /* Pointer to OID to store */ - int ret_value; + H5G_obj_t ret_value; FUNC_ENTER_NOINIT(H5R_get_obj_type); diff --git a/test/dsets.c b/test/dsets.c index c229e13..24ed910 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -2253,11 +2253,8 @@ test_can_apply(hid_t file) printf(" Line %d: Can't set chunk sizes\n",__LINE__); goto error; } /* end if */ -#ifdef H5_WANT_H5_V1_4_COMPAT - if(H5Zregister (H5Z_FILTER_BOGUS, "bogus", filter_bogus)<0) { -#else /* H5_WANT_H5_V1_4_COMPAT */ +#ifndef H5_WANT_H5_V1_4_COMPAT if(H5Zregister (H5Z_CAN_APPLY)<0) { -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5_FAILED(); printf(" Line %d: Can't register 'can apply' filter\n",__LINE__); goto error; @@ -2267,6 +2264,7 @@ test_can_apply(hid_t file) printf(" Line %d: Can't set bogus filter\n",__LINE__); goto error; } +#endif /* H5_WANT_H5_V1_4_COMPAT */ /* Create the data space */ if ((sid = H5Screate_simple(2, dims, NULL))<0) { @@ -2559,11 +2557,8 @@ test_set_local(const char *filename, hid_t fapl) printf(" Line %d: Can't set chunk sizes\n",__LINE__); goto error; } /* end if */ -#ifdef H5_WANT_H5_V1_4_COMPAT - if(H5Zregister (H5Z_FILTER_BOGUS2, "bogus2", filter_bogus2)<0) { -#else /* H5_WANT_H5_V1_4_COMPAT */ +#ifndef H5_WANT_H5_V1_4_COMPAT if(H5Zregister (H5Z_SET_LOCAL)<0) { -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5_FAILED(); printf(" Line %d: Can't register 'set local' filter\n",__LINE__); goto error; @@ -2573,6 +2568,7 @@ test_set_local(const char *filename, hid_t fapl) printf(" Line %d: Can't set bogus2 filter\n",__LINE__); goto error; } +#endif /* H5_WANT_H5_V1_4_COMPAT */ /* Create the data space */ if ((sid = H5Screate_simple(2, dims, NULL))<0) { @@ -2827,10 +2823,12 @@ main(void) nerrors += test_multiopen (file)<0 ?1:0; nerrors += test_types(file)<0 ?1:0; nerrors += test_userblock_offset(fapl)<0 ?1:0; - nerrors += test_missing_filter(file)<0 ?1:0; + nerrors += test_missing_filter(file)<0 ?1:0; +#ifndef H5_WANT_H5_V1_4_COMPAT nerrors += test_can_apply(file)<0 ?1:0; - nerrors += test_can_apply_szip(file)<0 ?1:0; nerrors += test_set_local(filename,fapl)<0 ?1:0; +#endif /* H5_WANT_H5_V1_4_COMPAT */ + nerrors += test_can_apply_szip(file)<0 ?1:0; if (H5Fclose(file)<0) goto error; if (nerrors) goto error; |