[svn-r14903] Undoing change committed in r14902.

1 files changed, 40 insertions, 1 deletions

diff --git a/src/H5F.c b/src/H5F.c
index cb9e3b8..80c28bc 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -978,6 +978,9 @@ done:
  * Programmer:	Robb Matzke
  *		matzke@llnl.gov
  *		Jul 18 1997
+ * Modifications:
+ *		Vailin Choi,  April 2, 2008
+ *		Free f->extpath
  *
  *-------------------------------------------------------------------------
  */
@@ -1068,6 +1071,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
 
     /* Free the non-shared part of the file */
     f->name = H5MM_xfree(f->name);
+    f->extpath = H5MM_xfree(f->extpath);
     f->mtab.child = H5MM_xfree(f->mtab.child);
     f->mtab.nalloc = 0;
     if(H5FO_top_dest(f) < 0)
@@ -1078,6 +1082,8 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_dest() */
 
+
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5F_open
@@ -1157,6 +1163,9 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
  *		Modified H5F_flush call to take one flag instead of
  *		multiple Boolean flags.
  *
+ *		Vailin Choi, 2008-04-02
+ *		To formulate path for later searching of target file for external link
+ *		via H5_build_extpath().
  *-------------------------------------------------------------------------
  */
 H5F_t *
@@ -1353,6 +1362,10 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "file close degree doesn't match")
     } /* end if */
 
+    /* formulate the absolute path for later search of target file for external link */
+    if (H5_build_extpath(name, &file->extpath) < 0)
+	HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to build extpath")
+    
     /* Success */
     ret_value = file;
 
@@ -2140,6 +2153,33 @@ H5F_get_intent(const H5F_t *f)
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5F_get_extpath
+ *
+ * Purpose:	Retrieve the file's 'extpath' flags
+ *		This is used by H5L_extern_traverse() to retrieve the main file's location
+ *		when searching the target file.
+ *
+ * Return:	'extpath' on success/abort on failure (shouldn't fail)
+ * 
+ * Programmer:	Vailin Choi, April 2, 2008
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+char *
+H5F_get_extpath(const H5F_t *f)
+{
+    /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_extpath)
+
+    HDassert(f);
+
+    FUNC_LEAVE_NOAPI(f->extpath)
+} /* end H5F_get_extpath() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5F_sizeof_addr
  *
  * Purpose:	Quick and dirty routine to retrieve the size of the file's size_t
@@ -3618,4 +3658,3 @@ H5Fget_info(hid_t obj_id, H5F_info_t *finfo)
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Fget_info() */
-