[svn-r19292] Description:

	Merge r19290 & r19291 from 1.8 branch to trunk:

r19290:
Correct another error in metadata accumulator dirty region calculations
(this time with a corner case when freeing data in the file).

r19291:
Avoid getting object information for soft/external links if we aren't
going to traverse across the link itself.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

1 files changed, 8 insertions, 8 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index c3d74b5..5d2343a 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -951,7 +951,7 @@ hsize_t diff_compare(hid_t file1_id,
         if (obj1type == H5TRAV_TYPE_LINK)
         {
             /* get type of target object */
-            l_ret = H5tools_get_link_info(file1_id, obj1_name, &linkinfo1);
+            l_ret = H5tools_get_link_info(file1_id, obj1_name, &linkinfo1, TRUE);
             /* dangling link */
             if (l_ret == 0)
             {
@@ -984,7 +984,7 @@ hsize_t diff_compare(hid_t file1_id,
         if (obj2type == H5TRAV_TYPE_LINK)
         {
             /* get type target object */
-            l_ret = H5tools_get_link_info(file2_id, obj2_name, &linkinfo2);
+            l_ret = H5tools_get_link_info(file2_id, obj2_name, &linkinfo2, TRUE);
             /* dangling link */
             if (l_ret == 0)
             {
@@ -1021,7 +1021,7 @@ hsize_t diff_compare(hid_t file1_id,
         if (obj1type == H5TRAV_TYPE_UDLINK)
         {
             /* get type and name of target object */
-            l_ret = H5tools_get_link_info(file1_id, obj1_name, &linkinfo1);
+            l_ret = H5tools_get_link_info(file1_id, obj1_name, &linkinfo1, TRUE);
             /* dangling link */
             if (l_ret == 0)
             {
@@ -1055,7 +1055,7 @@ hsize_t diff_compare(hid_t file1_id,
         if (obj2type == H5TRAV_TYPE_UDLINK)
         {
             /* get type and name of target object */
-            l_ret = H5tools_get_link_info(file2_id, obj2_name, &linkinfo2);
+            l_ret = H5tools_get_link_info(file2_id, obj2_name, &linkinfo2, TRUE);
             /* dangling link */
             if (l_ret == 0)
             {
@@ -1310,7 +1310,7 @@ hsize_t diff(hid_t file1_id,
         case H5TRAV_TYPE_LINK:
             {
             /* get type and name of target object */
-            ret = H5tools_get_link_info(file1_id, path1, &linkinfo1);
+            ret = H5tools_get_link_info(file1_id, path1, &linkinfo1, TRUE);
             /* dangling link */
             if (ret == 0)
             {
@@ -1328,7 +1328,7 @@ hsize_t diff(hid_t file1_id,
                 goto out;
 
             /* get type and name of target object */
-            ret = H5tools_get_link_info(file2_id, path2, &linkinfo2);
+            ret = H5tools_get_link_info(file2_id, path2, &linkinfo2, TRUE);
             /* dangling link */
             if (ret == 0)
             {
@@ -1394,7 +1394,7 @@ hsize_t diff(hid_t file1_id,
         case H5TRAV_TYPE_UDLINK:
             {
             /* get type and name of target object */
-            ret = H5tools_get_link_info(file1_id, path1, &linkinfo1);
+            ret = H5tools_get_link_info(file1_id, path1, &linkinfo1, TRUE);
             /* dangling link */
             if (ret == 0)
             {
@@ -1412,7 +1412,7 @@ hsize_t diff(hid_t file1_id,
                 goto out;
 
             /* get type and name of target object */
-            ret = H5tools_get_link_info(file2_id, path2, &linkinfo2);
+            ret = H5tools_get_link_info(file2_id, path2, &linkinfo2, TRUE);
             /* dangling link */
             if (ret == 0)
             {