[svn-r14187] Description:

	Put H5Acreate() under API versioning, with all internal usage shifted
to H5Acreate2().

	Add regression tests for H5Acreate1().

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-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.4.10 (amazon) in debug mode

1 files changed, 18 insertions, 18 deletions

diff --git a/test/tsohm.c b/test/tsohm.c
index 5b003c3..894f0bc 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -998,8 +998,8 @@ static void sohm_attr_helper(hid_t fcpl_id)
     /* Create and verify an attribute on a group */
     group_id = H5Gcreate2(file_id, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK_I(group_id, "H5Gcreate2");
-    attr_id = H5Acreate(group_id, "attribute", type_id, space_id, H5P_DEFAULT);
-    CHECK_I(attr_id, "H5Acreate");
+    attr_id = H5Acreate2(group_id, ".", "attribute", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK_I(attr_id, "H5Acreate2");
     ret = H5Awrite(attr_id, H5T_NATIVE_INT, wdata);
     CHECK_I(ret, "H5Awrite");
 
@@ -1034,8 +1034,8 @@ static void sohm_attr_helper(hid_t fcpl_id)
     /* Create and verify an attribute */
     group_id = H5Gcreate2(file_id, "another_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK_I(group_id, "H5Gcreate2");
-    attr_id = H5Acreate(group_id, "attribute", type_id, space_id, H5P_DEFAULT);
-    CHECK_I(attr_id, "H5Acreate");
+    attr_id = H5Acreate2(group_id, ".", "attribute", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK_I(attr_id, "H5Acreate2");
     ret = H5Awrite(attr_id, H5T_NATIVE_INT, wdata);
     CHECK_I(ret, "H5Awrite");
 
@@ -1484,8 +1484,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size
         dset_id = H5Dcreate(file_id, DSETNAME[x], dtype1_id, dspace1_id, dcpl1_id);
         CHECK_I(dset_id, "H5Dcreate");
 
-        attr_id = H5Acreate(dset_id, "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT);
-        CHECK_I(attr_id, "H5Acreate");
+        attr_id = H5Acreate2(dset_id, ".", "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        CHECK_I(attr_id, "H5Acreate2");
         ret = H5Awrite(attr_id, attr_type_id, attr_string1);
         CHECK_I(ret, "H5Awrite");
 
@@ -1533,8 +1533,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size
         dset_id = H5Dcreate(group_id, DSETNAME[x], dtype2_id, dspace2_id, dcpl2_id);
         CHECK_I(dset_id, "H5Dcreate");
 
-        attr_id = H5Acreate(dset_id, "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT);
-        CHECK_I(attr_id, "H5Acreate");
+        attr_id = H5Acreate2(dset_id, ".", "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        CHECK_I(attr_id, "H5Acreate2");
         ret = H5Awrite(attr_id, attr_type_id, attr_string2);
         CHECK_I(ret, "H5Awrite");
 
@@ -1574,8 +1574,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size
         dset_id = H5Dcreate(group_id, DSETNAME[x], dtype1_id, dspace1_id, dcpl1_id);
         CHECK_I(dset_id, "H5Dcreate");
 
-        attr_id = H5Acreate(dset_id, "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT);
-        CHECK_I(attr_id, "H5Acreate");
+        attr_id = H5Acreate2(dset_id, ".", "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        CHECK_I(attr_id, "H5Acreate2");
         ret = H5Awrite(attr_id, attr_type_id, attr_string1);
         CHECK_I(ret, "H5Awrite");
 
@@ -1587,8 +1587,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size
         dset_id = H5Dcreate(group_id, DSETNAME[x+1], dtype2_id, dspace2_id, dcpl2_id);
         CHECK_I(dset_id, "H5Dcreate");
 
-        attr_id = H5Acreate(dset_id, "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT);
-        CHECK_I(attr_id, "H5Acreate");
+        attr_id = H5Acreate2(dset_id, ".", "attr_name", attr_type_id, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        CHECK_I(attr_id, "H5Acreate2");
         ret = H5Awrite(attr_id, attr_type_id, attr_string2);
         CHECK_I(ret, "H5Awrite");
 
@@ -1632,8 +1632,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size
         attr_string1[1] = attr_name[1] = (x % 10) + '0';
 
         /* Create an attribute on the group */
-        attr_id = H5Acreate(group_id, attr_name, attr_type_id, attr_space_id, H5P_DEFAULT);
-        CHECK_I(attr_id, "H5Acreate");
+        attr_id = H5Acreate2(group_id, ".", attr_name, attr_type_id, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        CHECK_I(attr_id, "H5Acreate2");
         ret = H5Awrite(attr_id, attr_type_id, attr_string1);
         CHECK_I(ret, "H5Awrite");
 
@@ -1672,8 +1672,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size
         attr_string1[1] = attr_name[1] = (x % 10) + '0';
 
         /* Create an attribute on the group */
-        attr_id = H5Acreate(group_id, attr_name, attr_type_id, attr_space_id, H5P_DEFAULT);
-        CHECK_I(attr_id, "H5Acreate");
+        attr_id = H5Acreate2(group_id, ".", attr_name, attr_type_id, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        CHECK_I(attr_id, "H5Acreate2");
         ret = H5Awrite(attr_id, attr_type_id, attr_string1);
         CHECK_I(ret, "H5Awrite");
 
@@ -2573,8 +2573,8 @@ static void delete_helper_write(hid_t file_id, hid_t *dspace_id, hid_t *dcpl_id,
     CHECK_I(ret, "H5Dwrite");
 
     /* Create an attribute on the dataset. */
-    attr_id = H5Acreate(dset_id, "attr_name", H5T_NATIVE_CHAR, dspace_id[x], H5P_DEFAULT);
-    CHECK_I(attr_id, "H5Acreate");
+    attr_id = H5Acreate2(dset_id, ".", "attr_name", H5T_NATIVE_CHAR, dspace_id[x], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK_I(attr_id, "H5Acreate2");
 
     /* Write to attribute */
     ret = H5Awrite(attr_id, H5T_NATIVE_CHAR, &wdata);