diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-04-14 22:21:54 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-04-14 22:21:54 (GMT) |
| commit | 2521c4084c06f078846fe06bb1d3cd7bfa506316 (patch) | |
| tree | 466b9213c163d812778434bba2097705b423e799 /tools/h5repack | |
| parent | 3468ff3a5c4f6c384801edef9ae52ecc4f2de3c5 (diff) | |
| download | hdf5-2521c4084c06f078846fe06bb1d3cd7bfa506316.zip hdf5-2521c4084c06f078846fe06bb1d3cd7bfa506316.tar.gz hdf5-2521c4084c06f078846fe06bb1d3cd7bfa506316.tar.bz2 | |
[svn-r12254] Purpose:
Anti-feature
Description:
Revert changes to H5G_stat_t struct, to make it compatible with the 1.6.x
branch again. The information that was added to the H5G_stat_t struct will
be reported through other API routines.
Platforms tested:
FreeBSD 4.11 (sleipnir) w/C++
Linux 2.4/64 (mir) w/C++ & Fortran
Solaris 2.9 (shanti)
Diffstat (limited to 'tools/h5repack')
| -rw-r--r-- | tools/h5repack/h5repack_copy.c | 4 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_refs.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 55b56d1..7b11b93 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -572,9 +572,9 @@ int do_copy_objects(hid_t fidin, if (H5Gget_objinfo(fidin,travt->objs[i].name,FALSE,&statbuf)<0) goto error; - targbuf = malloc(statbuf.u.slink.linklen); + targbuf = malloc(statbuf.linklen); - if (H5Gget_linkval(fidin,travt->objs[i].name,statbuf.u.slink.linklen,targbuf)<0) + if (H5Gget_linkval(fidin,travt->objs[i].name,statbuf.linklen,targbuf)<0) goto error; if (H5Glink(fidout, diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c index 83b1c13..6e3156b 100644 --- a/tools/h5repack/h5repack_refs.c +++ b/tools/h5repack/h5repack_refs.c @@ -787,7 +787,7 @@ static const char* MapIdToName(hid_t refobj_id, return NULL; if (H5Dclose(id)<0) return NULL; - if (refstat.fileno==objstat.fileno && refstat.u.obj.objno==objstat.u.obj.objno) + if (!HDmemcmp(&refstat.fileno, &objstat.fileno, sizeof(refstat.fileno)) && !HDmemcmp(&refstat.objno, &objstat.objno, sizeof(refstat.objno))) { H5Fclose(fid); return travt->objs[i].name; |