[svn-r12932] Description:

    Basic support for H5Literate() routine.  Still needs to be fleshed out and
refactored to simplify.  Also, needs tests. :-)

Tested on:
    FreeBSD/32 4.11 (sleipnir)
    Linux/32 2.4 (heping)
    Linux/64 2.4 (mir)
    AIX/32 5.? (copper)
    Mac OS X/32 10.4.8 (amazon)

2 files changed, 12 insertions, 12 deletions

diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index d23f410..f8c0cad 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -1766,12 +1766,12 @@ udlink_open(hid_t location, const char *name)
     {
         /* For external links, try to display info for the object it points to */
         case H5L_TYPE_EXTERNAL:
-            if((buf = HDmalloc(linfo.u.link_size)) == NULL)
+            if((buf = HDmalloc(linfo.u.val_size)) == NULL)
                 goto error;
-            if(H5Lget_val(location, name, buf, sizeof(buf), H5P_DEFAULT) < 0)
+            if(H5Lget_val(location, name, buf, linfo.u.val_size, H5P_DEFAULT) < 0)
                 goto error;
 
-            if(H5Lunpack_elink_val(buf, linfo.u.link_size,  &filename, &path) < 0) goto error;
+            if(H5Lunpack_elink_val(buf, linfo.u.val_size,  &filename, &path) < 0) goto error;
             HDfputs("file: ", stdout);
             HDfputs(filename, stdout);
             HDfputs("    path: ", stdout);
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index bc0f7cc..209406d 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -1087,34 +1087,34 @@ hsize_t diff (hid_t file1_id,
    /* Only external links will have a query function registered */
    if(li1.type == H5L_TYPE_EXTERNAL && li2.type == H5L_TYPE_EXTERNAL)
    {
-      buf1 = HDmalloc (li1.u.link_size);
-      buf2 = HDmalloc (li2.u.link_size);
+      buf1 = HDmalloc (li1.u.val_size);
+      buf2 = HDmalloc (li2.u.val_size);
 
-      if(H5Lget_val(file1_id, path1, buf1, li1.u.link_size, H5P_DEFAULT) < 0)
+      if(H5Lget_val(file1_id, path1, buf1, li1.u.val_size, H5P_DEFAULT) < 0)
       {
         HDfree (buf1); HDfree (buf2);
         goto out;
       }
-      if(H5Lget_val(file2_id, path2, buf2, li2.u.link_size, H5P_DEFAULT) < 0)
+      if(H5Lget_val(file2_id, path2, buf2, li2.u.val_size, H5P_DEFAULT) < 0)
       {
         HDfree (buf1); HDfree (buf2);
         goto out;
       }
 
       /* If the buffers are the same size, compare them */
-      if(li1.u.link_size == li2.u.link_size)
+      if(li1.u.val_size == li2.u.val_size)
       {
-        if(H5Lget_val(file1_id, path1, buf1, li1.u.link_size, H5P_DEFAULT) < 0)
+        if(H5Lget_val(file1_id, path1, buf1, li1.u.val_size, H5P_DEFAULT) < 0)
         {
           HDfree (buf1); HDfree (buf2);
           goto out;
         }
-        if(H5Lget_val(file2_id, path2, buf2, li2.u.link_size, H5P_DEFAULT) < 0)
+        if(H5Lget_val(file2_id, path2, buf2, li2.u.val_size, H5P_DEFAULT) < 0)
         {
           HDfree (buf1); HDfree (buf2);
           goto out;
         }
-        ret = HDmemcmp (buf1, buf2, li1.u.link_size);
+        ret = HDmemcmp (buf1, buf2, li1.u.val_size);
       }
       else
         ret = 1;
@@ -1134,7 +1134,7 @@ hsize_t diff (hid_t file1_id,
       /* If the link classes or the buffer length are not the
        * same, the links are "different"
        */
-      if((li1.type != li2.type) || (li1.u.link_size != li2.u.link_size))
+      if((li1.type != li2.type) || (li1.u.val_size != li2.u.val_size))
         nfound = 1;
       else
         nfound = 0;