diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-28 15:02:54 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-28 15:02:54 (GMT) |
| commit | ea343ef85416b42f68f28fb1024702c6726f7eea (patch) | |
| tree | d5c401bf83f7f5578df06c54f9fd9fb198732ed2 /tools/h5import | |
| parent | eb16d8bc2b2f37c7a1d75fe7bf5258eba21515b2 (diff) | |
| download | hdf5-ea343ef85416b42f68f28fb1024702c6726f7eea.zip hdf5-ea343ef85416b42f68f28fb1024702c6726f7eea.tar.gz hdf5-ea343ef85416b42f68f28fb1024702c6726f7eea.tar.bz2 | |
[svn-r14115] Description:
Remove all plain calls to H5Gopen() from source, replacing them with
either H5Gopen2().
Add test for H5Gopen1().
Reformatted several pieces of code, to clean them up.
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
Solaris/32 5.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'tools/h5import')
| -rwxr-xr-x | tools/h5import/h5import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c index b494a67..1babd9e 100755 --- a/tools/h5import/h5import.c +++ b/tools/h5import/h5import.c @@ -852,7 +852,7 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id) j = 0; handle = file_id; while(j < in->path.count - 1) { - if((group_id = H5Gopen(handle, in->path.group[j])) < 0) { + if((group_id = H5Gopen2(handle, in->path.group[j], H5P_DEFAULT)) < 0) { group_id = H5Gcreate2(handle, in->path.group[j++], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); for(; j < in->path.count - 1; j++) group_id = H5Gcreate2(group_id, in->path.group[j], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -2444,7 +2444,7 @@ process(struct Options *opt) j = 0; handle = file_id; while(j < in->path.count - 1) { - if((group_id = H5Gopen(handle, in->path.group[j])) < 0) { + if((group_id = H5Gopen2(handle, in->path.group[j], H5P_DEFAULT)) < 0) { group_id = H5Gcreate2(handle, in->path.group[j++], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); for (; j < in->path.count - 1; j++) group_id = H5Gcreate2(group_id, in->path.group[j], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |