[svn-r14156] Description:

	Add API versioning to H5Tcommit()

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

2 files changed, 32 insertions, 34 deletions

diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 05205b7..5180461 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -752,29 +752,29 @@ 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 = H5Topen(fidin, travt->objs[i].name)) < 0)
                     goto error;
 
-                if ((type_out = H5Tcopy(type_in))<0)
+                if((type_out = H5Tcopy(type_in)) < 0)
                     goto error;
 
-                if ((H5Tcommit(fidout,travt->objs[i].name,type_out))<0)
+                if((H5Tcommit2(fidout, travt->objs[i].name, type_out, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
                     goto error;
 
                 /*-------------------------------------------------------------------------
                  * copy attrs
                  *-------------------------------------------------------------------------
                  */
-                if (copy_attr(type_in,type_out,options)<0)
+                if(copy_attr(type_in, type_out, options) < 0)
                     goto error;
 
-                if (H5Tclose(type_in)<0)
+                if(H5Tclose(type_in) < 0)
                     goto error;
-                if (H5Tclose(type_out)<0)
+                if(H5Tclose(type_out) < 0)
                     goto error;
 
-                if (options->verbose)
-                    printf(FORMAT_OBJ,"type",travt->objs[i].name );
+                if(options->verbose)
+                    printf(FORMAT_OBJ, "type", travt->objs[i].name);
 
                 break;
 
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index cc5591d..0cdc4c0 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -1558,52 +1558,52 @@ int make_all_objects(hid_t loc_id)
     } s_t;
 
     /*-------------------------------------------------------------------------
-    * H5G_DATASET
-    *-------------------------------------------------------------------------
-    */
+     * H5G_DATASET
+     *-------------------------------------------------------------------------
+     */
     space_id = H5Screate_simple(1,dims,NULL);
     dset_id  = H5Dcreate(loc_id,"dset_referenced",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
     H5Sclose(space_id);
 
     /*-------------------------------------------------------------------------
-    * H5G_GROUP
-    *-------------------------------------------------------------------------
-    */
+     * H5G_GROUP
+     *-------------------------------------------------------------------------
+     */
     group_id  = H5Gcreate2(loc_id, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     root_id   = H5Gopen2(loc_id, "/", H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
-    * H5G_TYPE
-    *-------------------------------------------------------------------------
-    */
+     * H5G_TYPE
+     *-------------------------------------------------------------------------
+     */
 
     /* Create a memory compound datatype */
-    type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+    type_id = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_INT);
     H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_FLOAT);
 
     /* Commit compound datatype and close it */
-    H5Tcommit(loc_id, "type", type_id);
+    H5Tcommit2(loc_id, "type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     H5Tclose(type_id);
 
     /*-------------------------------------------------------------------------
-    * H5G_LINK
-    *-------------------------------------------------------------------------
-    */
+     * H5G_LINK
+     *-------------------------------------------------------------------------
+     */
 
     H5Lcreate_soft("dset", loc_id, "link", H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
-    * H5G_UDLINK
-    *-------------------------------------------------------------------------
-    */
+     * H5G_UDLINK
+     *-------------------------------------------------------------------------
+     */
     /* Create an external link. Other UD links are not supported by h5repack */
     H5Lcreate_external("file", "path", loc_id, "ext_link", H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
-    * write a series of datasetes
-    *-------------------------------------------------------------------------
-    */
+     * write a series of datasetes
+     *-------------------------------------------------------------------------
+     */
 
     write_dset_in(root_id,"dset_referenced",loc_id,0);
 
@@ -2409,8 +2409,7 @@ int make_early(void)
     if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
         goto out;
 
-    for(i = 0; i < iter; i++)
-    {
+    for(i = 0; i < iter; i++) {
         if((fid = H5Fopen(FNAME5, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
             goto out;
         if((dset_id = H5Dcreate(fid, "early", H5T_NATIVE_DOUBLE, sid, dcpl)) < 0)
@@ -2418,7 +2417,7 @@ int make_early(void)
         if((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
             goto out;
         sprintf(name, "%d", i);
-        if((H5Tcommit(fid, name, tid)) < 0)
+        if((H5Tcommit2(fid, name, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
         if(H5Tclose(tid) < 0)
             goto out;
@@ -2438,12 +2437,11 @@ int make_early(void)
     if((fid = H5Fcreate(FNAME6, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
 
-    for(i = 0; i < iter; i++)
-    {
+    for(i = 0; i < iter; i++) {
         if((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
             goto out;
         sprintf(name, "%d", i);
-        if((H5Tcommit(fid, name, tid)) < 0)
+        if((H5Tcommit2(fid, name, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
         if(H5Tclose(tid) < 0)
             goto out;