[svn-r14224] Description:

	Change H5Literate -> H5Literate_by_name and add simpler form of
H5Literate, to bring this routine into alignment with the other new API
routines.

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

6 files changed, 17 insertions, 17 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index be1d80a..b713194 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -1937,9 +1937,9 @@ dump_group(hid_t gid, const char *name)
                in the group, then, sort by creation order, otherwise by name */
             
             if((sort_by == H5_INDEX_CRT_ORDER) && (crt_order_flags & H5P_CRT_ORDER_TRACKED))
-                H5Literate(gid, ".", sort_by, sort_order, NULL, dump_all_cb, NULL, H5P_DEFAULT);
+                H5Literate(gid, sort_by, sort_order, NULL, dump_all_cb, NULL);
             else
-                H5Literate(gid, ".", H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL, H5P_DEFAULT);
+                H5Literate(gid, H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL);
 
         }
     } 
@@ -1960,9 +1960,9 @@ dump_group(hid_t gid, const char *name)
             in the group, then, sort by creation order, otherwise by name */
 
         if((sort_by == H5_INDEX_CRT_ORDER) && (crt_order_flags & H5P_CRT_ORDER_TRACKED))
-            H5Literate(gid, ".", sort_by, sort_order, NULL, dump_all_cb, NULL, H5P_DEFAULT);
+            H5Literate(gid, sort_by, sort_order, NULL, dump_all_cb, NULL);
         else
-            H5Literate(gid, ".", H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL, H5P_DEFAULT); 
+            H5Literate(gid, H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL); 
 
         
     }
@@ -5455,9 +5455,9 @@ xml_dump_group(hid_t gid, const char *name)
                 /* iterate through all the links */
 
                 if( (sort_by == H5_INDEX_CRT_ORDER) && (crt_order_flags & H5P_CRT_ORDER_TRACKED))
-                    H5Literate(gid, ".", sort_by, sort_order, NULL, dump_all_cb, NULL, H5P_DEFAULT);
+                    H5Literate(gid, sort_by, sort_order, NULL, dump_all_cb, NULL);
                 else
-                    H5Literate(gid, ".", H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL, H5P_DEFAULT);
+                    H5Literate(gid, H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL);
 
 
             }
@@ -5520,9 +5520,9 @@ xml_dump_group(hid_t gid, const char *name)
         /* iterate through all the links */
 
         if( (sort_by == H5_INDEX_CRT_ORDER) && (crt_order_flags & H5P_CRT_ORDER_TRACKED))
-            H5Literate(gid, ".", sort_by, sort_order, NULL, dump_all_cb, NULL, H5P_DEFAULT);
+            H5Literate(gid, sort_by, sort_order, NULL, dump_all_cb, NULL);
         else
-            H5Literate(gid, ".", H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL, H5P_DEFAULT);
+            H5Literate(gid, H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL);
     }
 
     indent -= COL;
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index db77b84..d270b0c 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -1668,7 +1668,7 @@ group_list2(hid_t grp, const char *name)
 
     if (recursive_g) {
         iter.container = name;
-        H5Literate(grp, ".", H5_INDEX_NAME, H5_ITER_INC, NULL, list, &iter, H5P_DEFAULT);
+        H5Literate(grp, H5_INDEX_NAME, H5_ITER_INC, NULL, list, &iter);
     }
     return 0;
 }
@@ -2321,7 +2321,7 @@ main(int argc, const char *argv[])
             } /* end if */
 
             /* list */
-            H5Literate(file, oname, H5_INDEX_NAME, H5_ITER_INC, NULL, list, &iter, H5P_DEFAULT);
+            H5Literate_by_name(file, oname, H5_INDEX_NAME, H5_ITER_INC, NULL, list, &iter, H5P_DEFAULT);
             free(container);
         } else if((root = H5Gopen2(file, "/", H5P_DEFAULT)) < 0) {
             leave(1); /*major problem!*/
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 2d67cc7..2fe3302 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -512,7 +512,7 @@ group_stats(hid_t group, const char *name, const char *fullname,
     iter->curr_depth++;
 
     /* Recursively descend into current group's objects */
-    H5Literate(group, name, H5_INDEX_NAME, H5_ITER_INC, NULL, walk, iter, H5P_DEFAULT);
+    H5Literate_by_name(group, name, H5_INDEX_NAME, H5_ITER_INC, NULL, walk, iter, H5P_DEFAULT);
 
     /* Revert current container info */
     iter->container = last_container;
diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c
index 715d05e..69ea08d 100644
--- a/tools/lib/h5tools_ref.c
+++ b/tools/lib/h5tools_ref.c
@@ -327,7 +327,7 @@ fill_ref_path_table_cb(hid_t group, const char *obj_name, const H5L_info_t *linf
                 /* Iterate over objects in this group, using this group's
                  * name as their prefix
                  */
-                if(H5Literate(group, obj_name, H5_INDEX_NAME, H5_ITER_INC, NULL, fill_ref_path_table_cb, thepath, H5P_DEFAULT) < 0) {
+                if(H5Literate_by_name(group, obj_name, H5_INDEX_NAME, H5_ITER_INC, NULL, fill_ref_path_table_cb, thepath, H5P_DEFAULT) < 0) {
                     error_msg(progname, "unable to dump group \"%s\"\n", thepath);
                     d_status = EXIT_FAILURE;
                 } /* end if */
@@ -375,7 +375,7 @@ fill_ref_path_table(hid_t fid)
     ref_path_table_put(root_path, oinfo.addr);
 
     /* Iterate over objects in this file */
-    if(H5Literate(fid, root_path, H5_INDEX_NAME, H5_ITER_INC, NULL, fill_ref_path_table_cb, (void *)"", H5P_DEFAULT) < 0) {
+    if(H5Literate(fid, H5_INDEX_NAME, H5_ITER_INC, NULL, fill_ref_path_table_cb, (void *)"") < 0) {
         error_msg(progname, "unable to dump root group\n");
         d_status = EXIT_FAILURE;
     } /* end if */
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index de2043e..fba76ad 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -506,7 +506,7 @@ find_objs_cb(hid_t group, const char *name, const H5L_info_t UNUSED *linfo, void
                     info->prefix = HDmalloc(tmp_len+1);
                     HDstrcpy(info->prefix, tmp);
 
-                    if(H5Literate(group, name, H5_INDEX_NAME, H5_ITER_INC, NULL, find_objs_cb, (void *)info, H5P_DEFAULT) < 0)
+                    if(H5Literate_by_name(group, name, H5_INDEX_NAME, H5_ITER_INC, NULL, find_objs_cb, (void *)info, H5P_DEFAULT) < 0)
                         ret_value = FAIL;
 
                     info->prefix = old_prefix;
@@ -613,7 +613,7 @@ init_objs(hid_t fid, find_objs_t *info, table_t **group_table,
     } /* end else */
 
     /* Find all shared objects */
-    return(H5Literate(fid, "/", H5_INDEX_NAME, H5_ITER_INC, NULL, find_objs_cb, (void *)info, H5P_DEFAULT));
+    return(H5Literate(fid, H5_INDEX_NAME, H5_ITER_INC, NULL, find_objs_cb, (void *)info));
 }
 
 
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 58d618d..14c59c4 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -188,7 +188,7 @@ traverse_cb(hid_t loc_id, const char *link_name, const H5L_info_t *linfo,
         udata->curr_path = link_path;
 
         /* Iterate over all links in group object */
-        if(H5Literate(loc_id, link_name, H5_INDEX_NAME, H5_ITER_INC, NULL, traverse_cb, udata, H5P_DEFAULT) < 0)
+        if(H5Literate_by_name(loc_id, link_name, H5_INDEX_NAME, H5_ITER_INC, NULL, traverse_cb, udata, H5P_DEFAULT) < 0)
             return(H5_ITER_ERROR);
 
         /* Restore path in udata */
@@ -244,7 +244,7 @@ traverse(hid_t file_id, const trav_visitor_t *visitor)
     udata.visitor = visitor;
 
     /* Iterate over all links in root group */
-    if(H5Literate(file_id, "/", H5_INDEX_NAME, H5_ITER_INC, NULL, traverse_cb, &udata, H5P_DEFAULT) < 0)
+    if(H5Literate(file_id, H5_INDEX_NAME, H5_ITER_INC, NULL, traverse_cb, &udata) < 0)
         return -1;
 
     /* Free visited addresses table */