[svn-r15840] Description:

	Convert local heap cache client to use metadata journaling cache.

	Other minor cleanups & simplifications, etc.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.5.2 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

1 files changed, 2 insertions, 58 deletions

diff --git a/src/H5Glink.c b/src/H5Glink.c
index 75a3e83..8122f6a 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -217,13 +217,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);
@@ -240,7 +239,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 = H5HL_offset_into(f, heap, ent->cache.slink.lval_offset);
+        s = H5HL_offset_into(heap, ent->cache.slink.lval_offset);
         HDassert(s);
 
         /* Copy the link value */
@@ -262,61 +261,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 = 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