summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2003-04-29 19:49:49 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2003-04-29 19:49:49 (GMT)
commit11fe5b0657249df7ebc9edc809a3bccc9d09df2c (patch)
treee507e24a8312a340c7437ca9b4260d1509ce031c /src
parentb58192dfe739118385748c776e8a99c16b82bb03 (diff)
downloadhdf5-11fe5b0657249df7ebc9edc809a3bccc9d09df2c.zip
hdf5-11fe5b0657249df7ebc9edc809a3bccc9d09df2c.tar.gz
hdf5-11fe5b0657249df7ebc9edc809a3bccc9d09df2c.tar.bz2
[svn-r6780] Purpose: Backward compatibility change
Description: 1.4 compatibility for H5G_obj_t type and H5Zregister test. Solution: use macro H5_WANT_H5_V1_4_COMPAT Platforms tested: h5committest
Diffstat (limited to 'src')
-rw-r--r--src/H5R.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5R.c b/src/H5R.c
index a085995..77f8306 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -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);