[svn-r641] Changed function names for beta release.

4 files changed, 19 insertions, 18 deletions

diff --git a/tools/h5dump.c b/tools/h5dump.c
index a858d40..58d723c 100644
--- a/tools/h5dump.c
+++ b/tools/h5dump.c
@@ -267,11 +267,12 @@ const char *pt;
  *
  *-----------------------------------------------------------------------*/
 static void
-dump_dataspace (hid_t space) {
-hsize_t size[64];
-hsize_t maxsize[64];  /* check max dims size */
-int ndims = H5Sextent_dims(space, size, maxsize);
-int i;
+dump_dataspace (hid_t space)
+{
+    hsize_t size[64];
+    hsize_t maxsize[64];  /* check max dims size */
+    int ndims = H5Sget_simple_extent_dims(space, size, maxsize);
+    int i;
 
     indent += col;
 
@@ -374,18 +375,18 @@ hid_t  attr_id, type, space;
 static herr_t
 dump_all (hid_t group, const char *name, void __unused__ *op_data)
 {
-hid_t obj;
-hid_t (*func)(void*);
-void *edata;
-char *buf;
-H5G_stat_t statbuf;
+    hid_t obj;
+    hid_t (*func)(void*);
+    void *edata;
+    char *buf;
+    H5G_stat_t statbuf;
 
     /* Disable error reporting */
     H5Eget_auto (&func, &edata);
     H5Eset_auto (NULL, NULL);
 
 
-    H5Gstat(group, name, FALSE, &statbuf);
+    H5Gget_stat(group, name, FALSE, &statbuf);
 
     switch (statbuf.type) {
     case H5G_LINK:
diff --git a/tools/h5dumputil.c b/tools/h5dumputil.c
index bbea153..63e1f71 100644
--- a/tools/h5dumputil.c
+++ b/tools/h5dumputil.c
@@ -266,12 +266,12 @@ h5dump_simple(FILE *stream, const h5dump_t *info, hid_t dset, hid_t p_type, int
         f_space = H5Aget_space(dset);
 
 
-    ndims = H5Sextent_ndims(f_space);
+    ndims = H5Sget_simple_extent_ndims(f_space);
     if ((size_t)ndims>NELMTS(sm_size)) return -1;
 
     /* Assume entire data space to be printed */
     for (i=0; i<(hsize_t)ndims; i++) p_min_idx[i] = 0;
-    H5Sextent_dims(f_space, p_max_idx, NULL);
+    H5Sget_simple_extent_dims(f_space, p_max_idx, NULL);
     for (i=0, p_nelmts=1; i<(hsize_t)ndims; i++) {
 	p_nelmts *= p_max_idx[i]-p_min_idx[i];
     }
diff --git a/tools/h5ls.c b/tools/h5ls.c
index a311c5b..0351da0 100644
--- a/tools/h5ls.c
+++ b/tools/h5ls.c
@@ -157,7 +157,7 @@ list_attr (hid_t obj, const char *attr_name, void __unused__ *op_data)
     if ((attr = H5Aopen_name (obj, attr_name))) {
 	hid_t space = H5Aget_space (attr);
 	hsize_t size[64];
-	int ndims = H5Sextent_dims (space, size, NULL);
+	int ndims = H5Sget_simple_extent_dims (space, size, NULL);
 	H5Sclose (space);
 	printf (" {");
 	for (i=0; i<ndims; i++) {
@@ -205,7 +205,7 @@ dataset_list1(hid_t dset)
      * already been printed.
      */
     space = H5Dget_space(dset);
-    ndims = H5Sextent_dims(space, cur_size, max_size);
+    ndims = H5Sget_simple_extent_dims(space, cur_size, max_size);
     printf (" {");
     for (i=0; i<ndims; i++) {
 	HDfprintf (stdout, "%s%Hu", i?", ":"", cur_size[i]);
@@ -345,7 +345,7 @@ list (hid_t group, const char *name, void __unused__ *cd)
     
     /* Get object information */
     H5E_BEGIN_TRY {
-	status = H5Gstat(group, name, FALSE, &sb);
+	status = H5Gget_stat(group, name, FALSE, &sb);
     } H5E_END_TRY;
     if (status<0) {
 	puts("**NOT FOUND**");
diff --git a/tools/h5tools.c b/tools/h5tools.c
index f6b7c24..3994c57 100644
--- a/tools/h5tools.c
+++ b/tools/h5tools.c
@@ -273,12 +273,12 @@ h5dump_simple(FILE *stream, const h5dump_t *info, hid_t dset, hid_t p_type)
      * match the dimensionality of the dataset.
      */
     f_space = H5Dget_space(dset);
-    ndims = H5Sextent_ndims(f_space);
+    ndims = H5Sget_simple_extent_ndims(f_space);
     if ((size_t)ndims>NELMTS(sm_size)) return -1;
 
     /* Assume entire data space to be printed */
     for (i=0; i<(hsize_t)ndims; i++) p_min_idx[i] = 0;
-    H5Sextent_dims(f_space, p_max_idx, NULL);
+    H5Sget_simple_extent_dims(f_space, p_max_idx, NULL);
     for (i=0, p_nelmts=1; i<(hsize_t)ndims; i++) {
 	p_nelmts *= p_max_idx[i]-p_min_idx[i];
     }