diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-26 03:17:42 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-26 03:17:42 (GMT) |
| commit | 49cd4a1f3affeaff363242114ca89f9c61876e0e (patch) | |
| tree | 624777f4ef5f28e5a3e010e4397c75e52f7cd02f /src/H5Gent.c | |
| parent | 9a359c82243eb630ab4338dba08796d2d7e43e1a (diff) | |
| download | hdf5-49cd4a1f3affeaff363242114ca89f9c61876e0e.zip hdf5-49cd4a1f3affeaff363242114ca89f9c61876e0e.tar.gz hdf5-49cd4a1f3affeaff363242114ca89f9c61876e0e.tar.bz2 | |
[svn-r18460] Description:
Fold metadata journaling changes into the trunk: mostly tweaky
small stuff, also removed the H5F_t* field from the H5G_entry_t struct.
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
Diffstat (limited to 'src/H5Gent.c')
| -rw-r--r-- | src/H5Gent.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/H5Gent.c b/src/H5Gent.c index 18883ac..9188009 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -107,9 +107,6 @@ H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent) HDassert(pp); HDassert(ent); - /* Set the entry's file pointer */ - ent->file = f; - /* decode header */ H5F_DECODE_LENGTH(f, *pp, ent->name_off); H5F_addr_decode(f, pp, &(ent->header)); @@ -400,9 +397,6 @@ H5G_ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name, HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type") } /* end switch */ - /* Set the file for the entry */ - ent->file = f; - done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5G_ent_convert() */ @@ -423,7 +417,7 @@ done: */ herr_t H5G_ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth, - H5HL_t *heap) + const H5HL_t *heap) { const char *lval = NULL; int nested_indent, nested_fwidth; |