[svn-r14160] Description:

	Make H5Topen versioned, and add regression test for H5Topen1.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode
        Mac OS X/32 10.4.10 (amazon) in debug mode

5 files changed, 15 insertions, 15 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 5706837..35e17a2 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -1500,7 +1500,7 @@ dump_all(hid_t group, const char *name, const H5L_info_t *linfo, void UNUSED *op
                 break;
 
             case H5O_TYPE_NAMED_DATATYPE:
-                if((obj = H5Topen(group, name)) < 0) {
+                if((obj = H5Topen2(group, name, H5P_DEFAULT)) < 0) {
                     error_msg(progname, "unable to dump datatype \"%s\"\n", name);
                     d_status = EXIT_FAILURE;
                     ret = FAIL;
@@ -3232,25 +3232,25 @@ handle_datatypes(hid_t fid, char *type, void UNUSED * data)
 {
     hid_t       type_id;
 
-    if ((type_id = H5Topen(fid, type)) < 0) {
+    if((type_id = H5Topen2(fid, type, H5P_DEFAULT)) < 0) {
         /* check if type is unamed datatype */
         unsigned idx = 0;
 
-        while (idx < type_table->nobjs ) {
+        while(idx < type_table->nobjs ) {
             char name[128];
 
-            if (!type_table->objs[idx].recorded) {
+            if(!type_table->objs[idx].recorded) {
                 /* unamed datatype */
                 sprintf(name, "/#"H5_PRINTF_HADDR_FMT, type_table->objs[idx].objno);
 
-                if (!HDstrcmp(name, type))
+                if(!HDstrcmp(name, type))
                     break;
-            }
+            } /* end if */
 
             idx++;
-        }
+        } /* end while */
 
-        if (idx ==  type_table->nobjs) {
+        if(idx ==  type_table->nobjs) {
             /* unknown type */
             begin_obj(dump_header_format->datatypebegin, type,
                       dump_header_format->datatypeblockbegin);
@@ -3269,7 +3269,7 @@ handle_datatypes(hid_t fid, char *type, void UNUSED * data)
     } else {
         dump_named_datatype(type_id, type);
 
-        if (H5Tclose(type_id) < 0)
+        if(H5Tclose(type_id) < 0)
             d_status = EXIT_FAILURE;
     }
 }
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 11b08b2..dedca0a 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -782,7 +782,7 @@ int do_copy_objects(hid_t fidin,
              */
             case H5TRAV_TYPE_NAMED_DATATYPE:
 
-                if((type_in = H5Topen(fidin, travt->objs[i].name)) < 0)
+                if((type_in = H5Topen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
                     goto error;
 
                 if((type_out = H5Tcopy(type_in)) < 0)
diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c
index d3dff90..f1738e8 100644
--- a/tools/h5repack/h5repack_refs.c
+++ b/tools/h5repack/h5repack_refs.c
@@ -345,7 +345,7 @@ int do_copy_refobjs(hid_t fidin,
             *-------------------------------------------------------------------------
             */
             case H5TRAV_TYPE_NAMED_DATATYPE:
-                if((type_in = H5Topen(fidin, travt->objs[i].name)) < 0)
+                if((type_in = H5Topen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
                     goto error;
                 if(H5Tclose(type_in) < 0)
                     goto error;
@@ -390,7 +390,7 @@ error:
  *  relative to LOC_IN, which is obtained either from
  * loc_id = H5Gopen2( fid, name, H5P_DEFAULT);
  * loc_id = H5Dopen( fid, name);
- * loc_id = H5Topen( fid, name);
+ * loc_id = H5Topen2( fid, name, H5P_DEFAULT);
  *
  * Return: 0, ok, -1 no
  *
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 3edd6e8..4a6a8cd 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -839,9 +839,9 @@ hsize_t diff(hid_t file1_id,
         *-------------------------------------------------------------------------
         */
         case H5TRAV_TYPE_NAMED_DATATYPE:
-            if((type1_id = H5Topen(file1_id, path1)) < 0)
+            if((type1_id = H5Topen2(file1_id, path1, H5P_DEFAULT)) < 0)
                 goto out;
-            if((type2_id = H5Topen(file2_id, path2)) < 0)
+            if((type2_id = H5Topen2(file2_id, path2, H5P_DEFAULT)) < 0)
                 goto out;
             
             if((ret = H5Tequal(type1_id, type2_id)) < 0)
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index ab089cb..89d18d3 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -24,7 +24,7 @@
  *  obtained either from
  * loc_id = H5Gopen2( fid, name, H5P_DEFAULT);
  * loc_id = H5Dopen( fid, name);
- * loc_id = H5Topen( fid, name);
+ * loc_id = H5Topen2( fid, name, H5P_DEFAULT);
  *
  * Return: number of differences found
  *