[svn-r12835] Description:

    Change H5Lget_linkinfo() to H5Lget_info() to better align with coming API
changes.

Tested on:
    Linux/32 2.6 (chicago)
    Linux/64 2.6 (chicago2)

4 files changed, 18 insertions, 19 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 384b765..2dc89a6 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -1414,7 +1414,7 @@ dump_all(hid_t group, const char *name, void * op_data)
     hid_t       obj;
     char       *obj_path = NULL;        /* Full path of object */
     H5G_stat_t  statbuf;
-    H5L_linkinfo_t linfo;              /* Link information */
+    H5L_info_t linfo;              /* Link information */
     herr_t      ret = SUCCEED;
 
     /* Stat the object */
@@ -1424,7 +1424,7 @@ dump_all(hid_t group, const char *name, void * op_data)
         ret = FAIL;
         goto done;
     } /* end if */
-    if(H5Lget_linkinfo(group, name, &linfo, H5P_DEFAULT) < 0) {
+    if(H5Lget_info(group, name, &linfo, H5P_DEFAULT) < 0) {
         error_msg(progname, "unable to get object information\n");
         d_status = EXIT_FAILURE;
         ret = FAIL;
@@ -3210,24 +3210,24 @@ static void
 handle_links(hid_t fid, char *links, void UNUSED * data)
 {
     H5G_stat_t  statbuf;
-    H5L_linkinfo_t linfo;
+    H5L_info_t linfo;
     char * elink_file;
     char * elink_path;
 
-    if (H5Gget_objinfo(fid, links, FALSE, &statbuf) < 0) {
+    if(H5Gget_objinfo(fid, links, FALSE, &statbuf) < 0) {
         error_msg(progname, "unable to get obj info from \"%s\"\n", links);
         d_status = EXIT_FAILURE;
-    } else if (H5Lget_linkinfo(fid, links, &linfo, H5P_DEFAULT) < 0) {
+    } else if(H5Lget_info(fid, links, &linfo, H5P_DEFAULT) < 0) {
         error_msg(progname, "unable to get link info from \"%s\"\n", links);
         d_status = EXIT_FAILURE;
-    } else if (statbuf.type == H5G_LINK) {    /* Soft link */
+    } else if(statbuf.type == H5G_LINK) {    /* Soft link */
         char *buf = HDmalloc(statbuf.linklen);
 
         begin_obj(dump_header_format->softlinkbegin, links,
                   dump_header_format->softlinkblockbegin);
         indentation(COL);
 
-        if (H5Lget_linkval(fid, links, statbuf.linklen, buf, H5P_DEFAULT) >= 0) {
+        if(H5Lget_linkval(fid, links, statbuf.linklen, buf, H5P_DEFAULT) >= 0) {
             printf("LINKTARGET \"%s\"\n", buf);
         } else {
             error_msg(progname, "h5dump error: unable to get link value for \"%s\"\n",
@@ -3238,7 +3238,7 @@ handle_links(hid_t fid, char *links, void UNUSED * data)
         end_obj(dump_header_format->softlinkend,
                 dump_header_format->softlinkblockend);
         HDfree(buf);
-    } else if (statbuf.type == H5G_UDLINK) {    /* User-defined link */
+    } else if(statbuf.type == H5G_UDLINK) {    /* User-defined link */
         char *buf = HDmalloc(statbuf.linklen);
         begin_obj(dump_header_format->udlinkbegin, links,
                   dump_header_format->udlinkblockbegin);
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index d34cae0..effab89 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -1750,12 +1750,12 @@ slink_open(hid_t location, const char *name)
 static hid_t
 udlink_open(hid_t location, const char *name)
 {
-    H5L_linkinfo_t linfo;
+    H5L_info_t linfo;
     char * buf = NULL;
     char * filename = NULL;
     char * path = NULL;
 
-    if(H5Lget_linkinfo(location, name, &linfo, H5P_DEFAULT) < 0) return -1;
+    if(H5Lget_info(location, name, &linfo, H5P_DEFAULT) < 0) return -1;
 
     switch(linfo.type)
     {
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index c7f9265..5fa88bd 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -1076,12 +1076,12 @@ hsize_t diff (hid_t file1_id,
   {
    char *buf1 = NULL;
    char *buf2 = NULL;
-   H5L_linkinfo_t li1;
-   H5L_linkinfo_t li2;
+   H5L_info_t li1;
+   H5L_info_t li2;
 
-   if (H5Lget_linkinfo (file1_id, path1, &li1, H5P_DEFAULT) < 0)
+   if(H5Lget_info(file1_id, path1, &li1, H5P_DEFAULT) < 0)
     goto out;
-   if (H5Lget_linkinfo (file1_id, path1, &li2, H5P_DEFAULT) < 0)
+   if(H5Lget_info(file1_id, path1, &li2, H5P_DEFAULT) < 0)
     goto out;
 
    /* Only external links will have a query function registered */
@@ -1128,7 +1128,7 @@ hsize_t diff (hid_t file1_id,
    else
    {
       /* If one or both of these links isn't an external link, we can only
-       * compare information from H5Lget_linkinfo since we don't have a query
+       * compare information from H5Lget_info since we don't have a query
        * function registered for them. */
 
       /* If the link classes or the buffer length are not the
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 8480f57..dc145ec 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -496,7 +496,7 @@ static int traverse( hid_t loc_id,
 
   case H5G_UDLINK:
   {
-    H5L_linkinfo_t linkbuf;
+    H5L_info_t linkbuf;
 
     /* increment */
     inserted_objs++;
@@ -506,9 +506,8 @@ static int traverse( hid_t loc_id,
 
     /* Get type of link */
     H5E_BEGIN_TRY {
-
-    /* get link class info */
-    H5Lget_linkinfo( loc_id, path, &linkbuf, H5P_DEFAULT);
+        /* get link class info */
+        H5Lget_info( loc_id, path, &linkbuf, H5P_DEFAULT);
     } H5E_END_TRY;
 
     if(linkbuf.type == H5L_TYPE_EXTERNAL)