summaryrefslogtreecommitdiffstats
path: root/src/H5Gent.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-06-03 15:35:28 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-06-03 15:35:28 (GMT)
commit235b3b86c1eabefcf6c4de9594a5609b6f03060b (patch)
treead92ab59e8545694bd914be12f46dc501f1963a0 /src/H5Gent.c
parente2fa1a7555ea0c548824c33f84a5e5c9efd1b938 (diff)
downloadhdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.zip
hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.tar.gz
hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.tar.bz2
[svn-r27144] Description:
Normalize trunk against the metadata_cache_merge branch, in preparation for merging the branch into the trunk. Tested on: MacOSX/64 10.10.3 (amazon) w/serial & parallel Linux/64 2.6.x (koala) w/serial Linux/32 2.6.x (jam) w/serial & parallel
Diffstat (limited to 'src/H5Gent.c')
-rw-r--r--src/H5Gent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 2cef9f7..3f243de 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -173,7 +173,7 @@ H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent)
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unknown symbol table entry cache type")
} /* end switch */
- *pp = p_ret + H5G_SIZEOF_ENTRY(f);
+ *pp = p_ret + H5G_SIZEOF_ENTRY_FILE(f);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -240,7 +240,7 @@ done:
herr_t
H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
{
- uint8_t *p_ret = *pp + H5G_SIZEOF_ENTRY(f);
+ uint8_t *p_ret = *pp + H5G_SIZEOF_ENTRY_FILE(f);
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)