[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

5 files changed, 52 insertions, 44 deletions

diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c
index 89cb5fb..d850f85 100644
--- a/tools/h5copy/h5copy.c
+++ b/tools/h5copy/h5copy.c
@@ -416,7 +416,7 @@ main (int argc, const char *argv[])
  if(verbose)
     linkinfo.opt.msg_mode = 1;
  
- li_ret = H5tools_get_link_info(fid_src, oname_src, &linkinfo);
+ li_ret = H5tools_get_link_info(fid_src, oname_src, &linkinfo, 1);
  if (li_ret == 0) /* dangling link */
  {
     if(H5Lcopy(fid_src, oname_src, 
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index fb08ddb..5bda0b4 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -1992,7 +1992,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
 
     switch(linfo->type) {
         case H5L_TYPE_SOFT:
-            ret = H5tools_get_link_info(iter->fid, name, &lnk_info);
+            ret = H5tools_get_link_info(iter->fid, name, &lnk_info, follow_symlink_g);
             /* lnk_info.trg_path is malloced in H5tools_get_link_info()
              * so it will be freed via buf later */
             buf = lnk_info.trg_path;
@@ -2048,8 +2048,9 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             {
             const char *filename;
             const char *path;
+            hbool_t follow_link = follow_symlink_g || follow_elink_g;
 
-            ret = H5tools_get_link_info(iter->fid, name, &lnk_info);
+            ret = H5tools_get_link_info(iter->fid, name, &lnk_info, follow_link);
             /* lnk_info.trg_path is malloced in H5tools_get_link_info()
              * so it will be freed via buf later */
             buf = lnk_info.trg_path;
@@ -2073,7 +2074,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
 
             /* Recurse through the external link */
             /* keep the follow_elink_g for backward compatibility with -E */
-            if(follow_symlink_g || follow_elink_g) 
+            if(follow_link)
             {
                 hbool_t orig_grp_literal = grp_literal_g;
                 HDfputc(' ', stdout);
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)
             {
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 2e3c756..a0fca8b 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -726,7 +726,8 @@ tmpfile(void)
  * Date: Feb 8, 2010
  *-------------------------------------------------------------------------*/
 int
-H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *link_info)
+H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *link_info,
+    hbool_t get_obj_type)
 {
     htri_t l_ret;
     H5O_info_t trg_oinfo;
@@ -779,37 +780,42 @@ H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *
         H5Pset_elink_fapl(lapl, fapl);
     } /* end if */
 
-    /*--------------------------------------------------------------
-     * if link's target object exist, get type
-     */
-     /* check if target object exist */
-    l_ret = H5Oexists_by_name(file_id, linkpath, lapl);
-    
-    /* detect dangling link */
-    if(l_ret == FALSE) {
-        ret = 0;
-        goto out;
-    } /* end if */
-    /* function failed */
-    else if(l_ret < 0)
-        goto out;    
-
-    /* get target object info */
-    if(H5Oget_info_by_name(file_id, linkpath, &trg_oinfo, lapl) < 0) {
-        if(link_info->opt.msg_mode == 1)
-            parallel_print("Warning: unable to get object information for <%s>\n", linkpath);
-        goto out;
+    /* Check for retrieving object info */
+    if(get_obj_type) {
+        /*--------------------------------------------------------------
+         * if link's target object exist, get type
+         */
+         /* check if target object exist */
+        l_ret = H5Oexists_by_name(file_id, linkpath, lapl);
+        
+        /* detect dangling link */
+        if(l_ret == FALSE) {
+            ret = 0;
+            goto out;
+        } /* end if */
+        /* function failed */
+        else if(l_ret < 0)
+            goto out;    
+
+        /* get target object info */
+        if(H5Oget_info_by_name(file_id, linkpath, &trg_oinfo, lapl) < 0) {
+            if(link_info->opt.msg_mode == 1)
+                parallel_print("Warning: unable to get object information for <%s>\n", linkpath);
+            goto out;
+        } /* end if */
+
+        /* check unknown type */
+        if(trg_oinfo.type < H5O_TYPE_GROUP || trg_oinfo.type >=H5O_TYPE_NTYPES) {
+            if(link_info->opt.msg_mode == 1)
+                parallel_print("Warning: target object of <%s> is unknown type\n", linkpath);
+            goto out;
+        }  /* end if */
+
+        /* set target obj type to return */
+        link_info->trg_type = trg_oinfo.type;
     } /* end if */
-
-    /* check unknown type */
-    if(trg_oinfo.type < H5O_TYPE_GROUP || trg_oinfo.type >=H5O_TYPE_NTYPES) {
-        if(link_info->opt.msg_mode == 1)
-            parallel_print("Warning: target object of <%s> is unknown type\n", linkpath);
-        goto out;
-    }  /* end if */
-
-    /* set target obj type to return */
-    link_info->trg_type = trg_oinfo.type;
+    else
+        link_info->trg_type = H5O_TYPE_UNKNOWN;
 
     /* succeed */
     ret = 1;
diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h
index 82a5a02..08451e1 100644
--- a/tools/lib/h5tools_utils.h
+++ b/tools/lib/h5tools_utils.h
@@ -156,7 +156,8 @@ typedef struct {
 
 
 /* Definitions of routines */
-H5TOOLS_DLL int H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *link_info);
+H5TOOLS_DLL int H5tools_get_link_info(hid_t file_id, const char * linkpath,
+    h5tool_link_info_t *link_info, hbool_t get_obj_type);
 H5TOOLS_DLL const char *h5tools_getprogname(void);
 H5TOOLS_DLL void     h5tools_setprogname(const char*progname);
 H5TOOLS_DLL int      h5tools_getstatus(void);