[svn-r11886] Purpose:

    Code cleanup

Description:
    Check in some of the code cleanups from working on the external link
support.  (This doesn't include any of the external link features)

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    Mac OSX.4 (amazon)
    Linux 2.4

1 files changed, 18 insertions, 9 deletions

diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c
index c93d2e5..89bdaf1 100644
--- a/tools/lib/h5tools_ref.c
+++ b/tools/lib/h5tools_ref.c
@@ -156,17 +156,26 @@ haddr_t
 ref_path_table_lookup(const char *thepath)
 {
     H5G_stat_t  sb;
-    haddr_t     ret_value;
 
-    /* Get object ID for object at path */
-    if(H5Gget_objinfo(thefile, thepath, TRUE, &sb)<0)
-	/*  fatal error ? */
+    /* Check for external link first, so we don't return the OID of an object in another file */
+    if(H5Gget_objinfo(thefile, thepath, FALSE, &sb)<0)
 	return HADDR_UNDEF;
-
-    /* Return OID or HADDR_UNDEF */
-    ret_value = ref_path_table_find(sb.u.obj.objno) ? sb.u.obj.objno : HADDR_UNDEF;
-
-    return(ret_value);
+    if(sb.type == H5G_LINK) {
+        /* Get object ID for object at path */
+        /* (If the object is not a soft link, we've already retrieved the
+         *      correct information and don't have to perform this call. -QAK
+         */
+        if(H5Gget_objinfo(thefile, thepath, TRUE, &sb)<0)
+            /*  fatal error ? */
+            return HADDR_UNDEF;
+    } /* end if */
+
+
+    /* All existing objects in the file had better be in the table */
+    HDassert(ref_path_table_find(sb.u.obj.objno));
+
+    /* Return OID */
+    return(sb.u.obj.objno);
 }
 
 /*-------------------------------------------------------------------------