[svn-r14185] Description:

	Move H5Aopen_name() routine to deprecated symbol section and replace
internal usage with H5Aopen().

	Add simple regression test for H5Aopen_name() to deprecated routine
test.

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

3 files changed, 28 insertions, 27 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index ba72442..01a624c 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -1234,7 +1234,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t UNUSED *info, vo
     begin_obj(dump_header_format->attributebegin, attr_name,
           dump_header_format->attributeblockbegin);
 
-    if((attr_id = H5Aopen_name(oid, attr_name)) < 0) {
+    if((attr_id = H5Aopen(oid, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         indentation(indent + COL);
         error_msg(progname, "unable to open attribute \"%s\"\n", attr_name);
         indentation(indent);
@@ -1318,7 +1318,7 @@ dump_selected_attr(hid_t loc_id, const char *name)
         return FAIL;
     } /* end if */
 
-    if((attr_id = H5Aopen_name(oid, attr_name)) >= 0) {
+    if((attr_id = H5Aopen(oid, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
         hid_t type, space;
 
         type = H5Aget_type(attr_id);
@@ -5090,7 +5090,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t UNUSED *info,
     printf("<%sAttribute Name=\"%s\">\n",xmlnsprefix, t_aname);
     free(t_aname);
 
-    if ((attr_id = H5Aopen_name(attr, attr_name)) >= 0) {
+    if ((attr_id = H5Aopen(attr, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
         type = H5Aget_type(attr_id);
         space = H5Aget_space(attr_id);
         space_type = H5Sget_simple_extent_type(space);
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index e12b447..06de2bc 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -1336,20 +1336,21 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
 
     printf("    Attribute: ");
     n = display_string(stdout, attr_name, TRUE);
-    printf("%*s", MAX(0, 9-n), "");
+    printf("%*s", MAX(0, (9 - n)), "");
 
-    if ((attr = H5Aopen_name(obj, attr_name))) {
+    if((attr = H5Aopen(obj, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT))) {
         space = H5Aget_space(attr);
         type = H5Aget_type(attr);
 
         /* Data space */
         ndims = H5Sget_simple_extent_dims(space, size, NULL);
         space_type = H5Sget_simple_extent_type(space);
-        switch (space_type) {
+        switch(space_type) {
             case H5S_SCALAR:
                 /* scalar dataspace */
                 puts(" scalar");
                 break;
+
             case H5S_SIMPLE:
                 /* simple dataspace */
                 printf(" {");
@@ -1359,15 +1360,17 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
                 }
                 puts("}");
                 break;
+
             case H5S_NULL:
                 /* null dataspace */
                 puts(" null");
                 break;
+
             default:
                 /* Unknown dataspace type */
                 puts(" unknown");
                 break;
-        }
+        } /* end switch */
 
         /* Data type */
         printf("        Type:      ");
@@ -1377,7 +1380,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
         /* Data */
         memset(&info, 0, sizeof info);
         info.line_multi_new = 1;
-        if (nelmts<5) {
+        if(nelmts < 5) {
             info.idx_fmt = "";
             info.line_1st  = "        Data:  ";
             info.line_pre  = "               ";
@@ -1393,43 +1396,43 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
         }
 
         info.line_ncols = width_g;
-        if (label_g) info.cmpd_name = "%s=";
-        if (string_g && 1==H5Tget_size(type) &&
-            H5T_INTEGER==H5Tget_class(type)) {
+        if(label_g)
+            info.cmpd_name = "%s=";
+        if(string_g && 1==H5Tget_size(type) &&
+                H5T_INTEGER==H5Tget_class(type)) {
             info.ascii = TRUE;
             info.elmt_suf1 = "";
             info.elmt_suf2 = "";
             info.idx_fmt  = "(%s)";
             info.line_pre = "            %s \"";
             info.line_suf = "\"";
-        }
+        } /* end if */
 
         /* values of type reference */
         info.obj_format = "-%lu:"H5_PRINTF_HADDR_FMT;
         info.obj_hidefileno = 0;
-        if (hexdump_g)
+        if(hexdump_g)
            p_type = H5Tcopy(type);
         else
            p_type = h5tools_get_native_type(type);
 
-        if (p_type>=0) {
+        if(p_type >= 0) {
             temp_need= nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type));
-            assert(temp_need==(hsize_t)((size_t)temp_need));
+            assert(temp_need == (hsize_t)((size_t)temp_need));
             need = (size_t)temp_need;
             buf = malloc(need);
             assert(buf);
-            if (H5Aread(attr, p_type, buf)>=0)
+            if(H5Aread(attr, p_type, buf) >= 0)
                h5tools_dump_mem(stdout, &info, attr, p_type, space, buf, -1);
             free(buf);
             H5Tclose(p_type);
-        }
+        } /* end if */
 
         H5Sclose(space);
         H5Tclose(type);
         H5Aclose(attr);
-    } else {
+    } else
         putchar('\n');
-    }
 
     return 0;
 }
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index d73b3c4..e94c723 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -95,26 +95,24 @@ hsize_t diff_attr(hid_t loc1_id,
   /* use the name on the first file to open the second file */
   H5E_BEGIN_TRY 
   {
-   if ((attr2_id = H5Aopen_name(loc2_id, name1))<0)
-   {
+   if((attr2_id = H5Aopen(loc2_id, ".", name1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
     goto error;
-   }
   } H5E_END_TRY;
 
   /* get name */
-  if (H5Aget_name( attr2_id, 255, name2 )<0)
+  if(H5Aget_name(attr2_id, 255, name2) < 0)
    goto error;
 
   /* get the file datatype  */
-  if ((ftype1_id = H5Aget_type( attr1_id )) < 0 )
+  if((ftype1_id = H5Aget_type(attr1_id)) < 0)
    goto error;
-  if ((ftype2_id = H5Aget_type( attr2_id )) < 0 )
+  if((ftype2_id = H5Aget_type(attr2_id)) < 0)
    goto error;
 
   /* get the dataspace handle  */
-  if ((space1_id = H5Aget_space( attr1_id )) < 0 )
+  if((space1_id = H5Aget_space(attr1_id)) < 0)
    goto error;
-  if ((space2_id = H5Aget_space( attr2_id )) < 0 )
+  if((space2_id = H5Aget_space(attr2_id)) < 0)
    goto error;
 
   /* get dimensions  */