From 4e7eb421c19744ddff51bb22eaed339a0615e7b1 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 27 May 2010 13:40:02 +0000
Subject: [PATCH] - obsolete hdf5_xyz() functions replaced

---
 src/C/H5Block.c    | 21 ++++++++-------------
 src/C/H5Part.c     | 15 +++++++--------
 src/C/H5_inquiry.c |  7 +++----
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/C/H5Block.c b/src/C/H5Block.c
index aa72714..8fcf128 100644
--- a/src/C/H5Block.c
+++ b/src/C/H5Block.c
@@ -1380,8 +1380,7 @@ H5BlockGetNumFields (
 	if ( ! _have_object ( f->step_gid, H5BLOCK_GROUPNAME_BLOCK ) )
 		return 0;
 
-	return hdf5_get_num_objects (
-		f->step_gid, H5BLOCK_GROUPNAME_BLOCK, H5G_GROUP );
+	return h5_get_num_hdf5_groups (f, f->b->blockgroup);
 }
 
 /*!
@@ -1416,10 +1415,7 @@ _get_field_info (
 	for ( i = 0, j = *grid_rank-1; i < *grid_rank; i++, j-- )
 		grid_dims[i] = (h5_int64_t)dims[j];
 
-	TRY ( *field_dims = hdf5_get_num_objects (
-		f->b->blockgroup,
-		field_name,
-		H5G_DATASET ) );
+	TRY( *field_dims = h5_get_num_hdf5_datasets (f, f->b->field_group_id) );
 	TRY( h5priv_close_hdf5_dataspace( f, dataspace_id ) );
 	TRY( h5priv_close_hdf5_dataset( f, dataset_id ) );
 	TRY( h5priv_close_hdf5_group( f, group_id ) ); 
@@ -1454,13 +1450,12 @@ H5BlockGetFieldInfo (
 	SET_FNAME ( f, __func__ );
 	CHECK_TIMEGROUP( f );
 
-	TRY ( hdf5_get_object_name (
-		f->step_gid,
-		H5BLOCK_GROUPNAME_BLOCK,
-		H5G_GROUP,
-		idx,
-		field_name,
-		len_field_name ) );
+	TRY( h5_get_hdf5_groupname_by_idx (
+		     f,
+		     f->b->blockgroup,
+		     idx,
+		     field_name,
+		     len_field_name) );
 
 	return _get_field_info (
 		f, field_name, grid_rank, grid_dims, field_dims );
diff --git a/src/C/H5Part.c b/src/C/H5Part.c
index 0aabd51..bd78ab9 100644
--- a/src/C/H5Part.c
+++ b/src/C/H5Part.c
@@ -622,7 +622,7 @@ H5PartGetNumDatasets (
 	SET_FNAME ( f, __func__ );
 	CHECK_FILEHANDLE ( f );
 
-	return hdf5_get_num_objects ( f->file, f->step_name, H5G_DATASET );
+	return  h5_get_num_hdf5_datasets (f, f->step_gid);
 }
 
 /*!
@@ -638,9 +638,9 @@ H5PartGetNumDatasets (
 h5_int64_t
 H5PartGetDatasetName (
 	h5_file_t *f,			/*!< [in]  Handle to open file */
-	const h5_int64_t idx,	/*!< [in]  Index of the dataset */
+	const h5_int64_t idx,		/*!< [in]  Index of the dataset */
 	char *name,			/*!< [out] Name of dataset */
-	const h5_int64_t len_of_name/*!< [in]  Size of buffer \c name */
+	const h5_int64_t len_of_name	/*!< [in]  Size of buffer \c name */
 	) {
 
 	SET_FNAME ( f, __func__ );
@@ -648,13 +648,12 @@ H5PartGetDatasetName (
 	if ( h5_check_filehandle ( f ) != H5_SUCCESS )
 		return h5_get_errno ( f );
 
-	return hdf5_get_object_name (
-		f->file,
-		f->step_name,
-		H5G_DATASET,
+	return h5_get_hdf5_datasetname_by_idx (
+		f,
+		f->step_gid,
 		idx,
 		name,
-		len_of_name );
+		len_of_name);
 }
 
 /*!
diff --git a/src/C/H5_inquiry.c b/src/C/H5_inquiry.c
index a3c9a27..f08f201 100644
--- a/src/C/H5_inquiry.c
+++ b/src/C/H5_inquiry.c
@@ -60,10 +60,9 @@ H5GetNumSteps (
 	SET_FNAME (f, __func__);
 	CHECK_FILEHANDLE (f);
 
-	return hdf5_get_num_objects_matching_pattern (
-		f->file,
-		"/",
-		H5G_UNKNOWN,
+	return h5_get_num_hdf5_groups_matching_prefix (
+		f,
+		f->step_gid,
 		f->prefix_step_name);
 }