[svn-r18072] Description:

	Bring r18071 from metadata journaling merge branch:

	Refactor local heap routines with changes from metadata journaling
branch, along with other misc. changes as the changes on the metadata journaling
branch are being converged with the current state of the trunk.

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, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.6.2 (amazon) in debug mode
        Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

1 files changed, 2 insertions, 58 deletions

diff --git a/src/H5Glink.c b/src/H5Glink.c
index 488c05b..f5ad7d9 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -218,13 +218,12 @@ H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_ent_to_link(H5F_t *f, H5O_link_t *lnk, const H5HL_t *heap,
+H5G_ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
     const H5G_entry_t *ent, const char *name)
 {
     FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_to_link)
 
     /* check arguments */
-    HDassert(f);
     HDassert(lnk);
     HDassert(heap);
     HDassert(ent);
@@ -241,7 +240,7 @@ H5G_ent_to_link(H5F_t *f, H5O_link_t *lnk, const H5HL_t *heap,
     if(ent->type == H5G_CACHED_SLINK) {
         const char *s;          /* Pointer to link value */
 
-        s = (const char *)H5HL_offset_into(f, heap, ent->cache.slink.lval_offset);
+        s = (const char *)H5HL_offset_into(heap, ent->cache.slink.lval_offset);
         HDassert(s);
 
         /* Copy the link value */
@@ -263,61 +262,6 @@ H5G_ent_to_link(H5F_t *f, H5O_link_t *lnk, const H5HL_t *heap,
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_ent_to_info
- *
- * Purpose:     Make link info for a symbol table entry
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
- *		Nov 16 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_ent_to_info(H5F_t *f, H5L_info_t *info, const H5HL_t *heap,
-    const H5G_entry_t *ent)
-{
-    FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_to_info)
-
-    /* check arguments */
-    HDassert(f);
-    HDassert(info);
-    HDassert(heap);
-    HDassert(ent);
-
-    /* Set (default) common info for info */
-    info->cset = H5F_DEFAULT_CSET;
-    info->corder = 0;
-    info->corder_valid = FALSE;       /* Creation order not valid for this link */
-
-    /* Object is a symbolic or hard link */
-    if(ent->type == H5G_CACHED_SLINK) {
-        const char *s;          /* Pointer to link value */
-
-        s = (const char *)H5HL_offset_into(f, heap, ent->cache.slink.lval_offset);
-        HDassert(s);
-
-        /* Get the link value size */
-        info->u.val_size = HDstrlen(s) + 1;
-
-        /* Set link type */
-        info->type = H5L_TYPE_SOFT;
-    } /* end if */
-    else {
-        /* Set address of object */
-        info->u.address = ent->header;
-
-        /* Set link type */
-        info->type = H5L_TYPE_HARD;
-    } /* end else */
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_ent_to_info() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5G_link_to_info
  *
  * Purpose:	Retrieve information from a link object