diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2021-02-08 16:56:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 16:56:16 (GMT) |
| commit | 22c67ff6570f16050f0a5654cf1c84df917bb598 (patch) | |
| tree | 38fb63aa498b250c2543fe7e22a511706de96a42 /test/unlink.c | |
| parent | 551f15f8ae02ca9c995619b216121081eb07633e (diff) | |
| download | hdf5-hdf5-1_8_22.zip hdf5-hdf5-1_8_22.tar.gz hdf5-hdf5-1_8_22.tar.bz2 | |
1.8/master (#317)hdf5-1_8_22
* Revert incorrect bool type
* Correct grep text for filter test
* Check sizeof type to use correct ref_type
* h5dump reg ref chnages has no error file
* Fix comment
* Remove unneeded files
* Verify the decoded version for "all" and "none" selection.
* Remove double entry
* Add missing include
* Snapshot version 1.8 release 22 (snap4)
Update version to 1.8-snap5
* Fixes for test failures with --disable-tests --disable-tools options.
Don't test ph5diff if tests are disabled.
* Correct conditions for parallel builds with and without tests.
* Snapshot version 1.8 release 22 (snap5)
Update version to 1.8.22-snap6
* TRILAB-192 merging warnings changes from develop
* Autotools reconfigure update
* Restore page ejects.
* Restore page eject chars
* Fix orphaned token
* Update LT files
* Correct extra flags and merge TRILAB-24
* Update release note for CMake warnings
* H5repack bug fixes from develop
* TRILAB-192 - merge changes from develop
Single source, config files, for warnings for both autotools and CMake.
Update CMake libraries, tools, tests to use correct flags.
* Add missing m4 file
* Remove 128bit config check fo 1.8
* TRILAB-192 update LTparse files
* A fix in the cleaning up code for datatype when datatype initialization via H5D__init_type() fails.
The code to fix the problem is the same as what is done in H5D__open_oid().
* Add missing " and update function calls incorrectly
named load_gcc_arguments.
Commit changes to gnu-cxxflags to remove unmatched " and to gnu-fflags
to not add C warnings flags to H5_FCFLAGS.
* TRILAB-192 - cleanup edits and match CMake CXX to autotools
* Fix shadowed type
* TRILAB-192 correct fortran commands
* TRILAB-192 version of std=f2008 special check
* Fix shadow variable
* Add prefix_relto_examplesdir function to set relative path to h5c++.
* TRILAB-192 - parser files cannot handle this warning
* Parallel Fortran tests now use the MPI module instead of including
mpif.h.
* Don't add general warnings flags for unsupported old versions of gcc and
g++ (older than gcc/g++ 4.2).
Correct gnu-cxxflags to determine warnings flags to be added based on
C++ compiler version instead of C compiler version.
* Snapshot version 1.8 release 22 (snap6)
Update version to 1.8.22-snap7
* TRILAB-244 separate CXX warnings and errors from C
* Fix NoFilter build
* Move ADD_H5_FLAGS macro from *CompilerFlags.cmake files to
config/cmake_ext_mod/HDFMacros.cmake for common use.
* Restrict errors to gcc 4.8 and above.
* OESS-65 replace szip with aec szip
* Correct CMake version
* Correct -Werror=unused-variable
* Add -Werror= flags to lists displayed in libhdf5.settings.
* Fix -Werror=unused-variable
* More fixes for unused variable
* Resolve warning errors from -Werror= flags:
-Werror=bad-function-cast
-Werror=bad-function-cast
-Werror=implicit-function-declaration
-Werror=nested-externs
* Remove verbose assignments in smoke_check 3 and 5 functions.
* Update to use optimization flags, C++ error flags, and correct
libhdf5.settings.in to remove unworkable changes.
* Update config/gnu-cxxflags.
* Add missing headers
* Fix ifort warning flag.
Restore AC_DEFUN([PAC_PROG_FC_DEFAULT_REALisDBLE] in m4/aclocal_fc.m4.
Add --enable-symbols, --enable-profiling, and --enable-optimization
options to autotools configure; all configure flags for
--enable-production and --disable-production should match HDF5 1.10 and
1.12 production and debug default flags.
* Add github actions file
* Correct path
* OESS-65 Fix packaging
* Update reference name
* Correct filename
* disable pr action and enable fail fast
* Snapshot 1.8.22-snap7
Update version to 1.8.22-snap8.
* Correct mingw path
* Correct mingw paths
* Revise gnu-*flags and cmake/HDF*CompilerFlags.cmake files to add warning
flags for GCC compilers version 4.8 and above.
Removed files from gnu-warnings that only apply to versions < 4.8.
Consolidated warnings from versions < 4.8 that apply to versions >= 4.8
into the 4.8 warnings files.
* Update MANIFEST for removal of older warnings files.
* Yanked all MPI-1 calls
Added batch scripts in bin/batch.
* Snapshot 1.8.22-snap8.
Update version to 1.8.22-snap9.
* Squashed commit of the following:
commit 45b0cbc71929930a874e1c09e0770aa64d0ae697
Author: Larry Knox <lrknox@hdfgroup.org>
Date: Thu Apr 23 13:14:56 2020 -0500
Add C++ warnings treated as error for autotools builds.
commit 6debcddcc766601799d5bd661bd60946f951a07e
Author: Larry Knox <lrknox@hdfgroup.org>
Date: Fri Jun 19 16:50:03 2020 -0500
Remove tests for develop branch from testh5cc.sh.in.
Add @H5_ECXXFLAGS@ to AM_CXXFLAGS.
commit fed497e7f207313b2a133d3b68c942b7d7104b90
Author: Larry Knox <lrknox@hdfgroup.org>
Date: Fri Jun 12 15:06:39 2020 -0500
Merge pull request #2646 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '998c6470d78e14228695419c3b514c35ecf3d69e':
Remove unnecessary version conditions for Clang compilers.
commit 92e52ce5c211bd1d3991a3b8bb67287ac7b652aa
Author: Larry Knox <lrknox@hdfgroup.org>
Date: Wed Jun 10 18:53:45 2020 -0500
Merge pull request #2639 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'a33667faf226f5d8c9633bf537893e8fce1bf1f6':
Add c++ to --enable-sanitize-checks option.
commit 2e802534fb997b81fa98fdd1c7d97d4310898e0d
Author: Larry Knox <lrknox@hdfgroup.org>
Date: Wed Jun 10 15:18:36 2020 -0500
Merge pull request #2633 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '20eab963899841c9a003baebead8e3bc07d9e127':
Remove duplicate entries in MANIFEST.
Make changes to CMake CompilerFlags.cmake files so extra flags are loaded for non-GNU compilers.
Update new clang files to not pick up clang as vendor for pgCC. Add new files to MANIFEST Temporary demotion of 2 -Werror warning flags that fail on macos 10.12 Remove Production flag unknown to Apple clang.
commit 96ef60a58a23847a7da89a891f2415055ec2ab60
Author: Larry Knox <lrknox@hdfgroup.org>
Date: Mon Jun 8 16:24:49 2020 -0500
Merge pull request #2631 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'b942a4d8a3e27317cac50ce37ff5302d477664d8':
Clean up code to get clang version in config/linux-gnulibc1
commit 8a7c687da568e8b50b38fa53da1ca63759be6ec4
Author: Larry Knox <lrknox@hdfgroup.org>
Date: Mon Jun 8 11:42:37 2020 -0500
Merge pull request #2623 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'c7626f79fdee4eee13925e240ef41e61f3367eab':
Add flags from config/clang-warnings/*general files to H5 C and CXX flags for all versions of Clang and Clang++ compilers. Switched from cut to awk in testcheck_version.sh.in to avoid dependence on tab vs. " " in version definitions in H5public.h.
Add files for adding warning flags for clang compilers in autotools configure.
commit db3ef7ff3c1ed79167cecef831501411cff8291f
Merge: 5a0f8d7 f9f1310
Author: Larry Knox <lrknox@hdfgroup.org>
Date: Fri Jun 19 14:46:22 2020 -0500
Merge branch 'hdf5_1_12' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_12
commit 5a0f8d7940ae57b445f545a0abd7e303ce6924ee
Author: Larry Knox <lrknox@hdfgroup.org>
Date: Wed Jun 10 20:15:41 2020 -0500
Merge pull request #2636 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:HDFFV-11000-update-testh5cc.sh.in-for-version to develop
* commit '5c0bd670d6e9919c463fbc05de99e2ba55b0761e':
Add tests for all version to H5_NO_DEPRECATED_SYMBOLS section and to section for current version, with and without default API version flags.
HDFFV-11000: update-testh5cc.sh.in to test sample versioned functions in HDF5 1.10, 1.12 and develop.
* Update configure and Makefile.ins after bin/reconfigure.
* Fix MANIFEST
* Fix HDFFV-10591
Description:
h52gif produced a segfault when a buffer overflow occurred because
the data size was corrupted and became very large. This commit added
a check on the data size against the buffer size to prevent the segfault.
It also added error reporting to h52gif to display an error message
instead of silently exiting when the failure occurred.
Platforms tested:
Linux/64 (jelly)
* Snapshot 1.8.22-snap9. Update version to 1.8.22-snap10.
* Merge pull request #2686 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '800f93f7c994f88dfa716746153ded4b1e690e3a':
Remove path to szip header file from AM_CPPFLAGS when configure check of libsz fails. Fix for HDFFV-10830.
* Regenerate configure.
* Merge from 1.10-1.12-dev - LT parse needs update
* Incorporate pull request #2693 from develop for the fix to HDFFV-11080:
(1) Patch up the file pointer when reading attribute of variable length datatype
(2) Test to verify the fix when doing multiple threads
(3) Update MANIFEST
(4) Add new test to Cmake
* Switch bison and flex update of LT files from bin/genltanalyse to
bin/genparser, and from automatically updating the LT files whenever
reconfigure is run to running only on man<F12>ual command.
* Update hl/sr/H5LT files.
Add bin/genparser to MANIFEST; remove bin/genltanalyze.
* Fix to the merge of PR #2708 for HDFFV-11080 to the 1.8 branch.
Need to checkin test/Makefile.in for the new file added.
* Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)
Description:
When a buffer overflow occurred because a name length was corrupted
and became very large, h5dump produced a segfault on one file and a
memcpy parameter overlap on another file. This commit added checks
that detect a read pass the end of the buffer to prevent these error
conditions.
Platforms tested:
Linux/64 (jelly)
* Fixed typo
* Check for header szlib.h only when libsz passes AC_CHECK_LIB, so that
H5_HAVE_SALIB_H is not defined when szip is not enabled, to prevent
compile failures for incompatible szlib.
* HDFFV-11127 - force RTLD_LOCAL in dlopen
* spelling
* Remove extra parens
* Remove unnecessary assignment freom configure.ac.
* Add hypen to subrelease regex
* Add special case when H5_VERS_SUBRELEASE is 0
* Revert H5_VERS_SUBRELEASE check
* The version string has a second use for packaging
* MinGW uses "MinGW Makefiles"
* Snapshot 1.8.22-snap10. Update version to 1.8.22-snap11.
* Merge clang-format changes from develop
* remove stray file
* Source formatted
* Add options to github actions.
* Add back file, remove py file
* HDFFV-11096 Correct h5dump usage text
* Update formating
* remove autogen for 1.8 branch
* Fix comment whitespace
* Change '==' to 'eq' in test script
* Merge from develop
github updates
bin scripts
parser updates
* Snapshot 1.8.22-snap11. Update version to 1.8.22-snap12.
* Merge from 1.10
Comments, whitespace
Simple init and if block brackets.
Minimal code changes limited to return value and spelling
* Update autotools files
* Update FD source
* More merges from 1.10 comments and inits
* Comment fixes
* Fix macro argument
* Remove autogen file and cache dir
* Revert autotools files to previous version
* Correct boolean value and missing define
* URL and options corrections
* revert autoconf files
* Fix compile issues with vfd drivers.
* Fix HDFS test
* Remove extra #endif
* Move init above execution
* Multiple changes to bring branch up-to-date (#87)
Correct TARGET variable and CMake config file location.
Add option to allow filter plugins to be built inline.
Update CMake tools macros.
* hdf5 1 8 release text (#113)
* Multiple changes to bring branch up-to-date
Correct TARGET variable and CMake config file location.
Add option to allow filter plugins to be built inline.
Update CMake tools macros.
* release text updates - mostly whitespace
* Fixed HDFFV-10480 and HDFFV-11159 (#145)
* Fixed HDFFV-10480 and HDFFV-11159
Description
Checked against buffer size to prevent segfault, in case of data corruption.
+ HDFFV-11159 CVE-2018-14033 Buffer over-read in H5O_layout_decode
+ HDFFV-10480 CVE-2018-11206 Buffer over-read in H5O_fill_new[/old]_decode and
A user's patch was applied to this previously, but it is redone
for a more correct fix, that is the check now accounted for the
previous advance of the buffer pointer.
Platforms tested:
Linux/64 (jelly)
* Fixed typo
* Update HDF5 1.8 copyright headers with updated copyright URL (#148)
* Update URL for COPYING file in copyright headers.
* Make fortran copyright headers uniformly spaced.
* Update url for Copyright file in c++/src/footer.html.
* OESS-98 Update plugin build option (#171)
* 1.8 has extra fortran CMake option (#176)
* 1.8 has extra fortran CMake option
* Update license URL
* OESS-98 fix tools test for plugins (#180)
* Hdf5 1 8 (#169)
* Fixed HDFFV-10480 and HDFFV-11159
Description
Checked against buffer size to prevent segfault, in case of data corruption.
+ HDFFV-11159 CVE-2018-14033 Buffer over-read in H5O_layout_decode
+ HDFFV-10480 CVE-2018-11206 Buffer over-read in H5O_fill_new[/old]_decode and
A user's patch was applied to this previously, but it is redone
for a more correct fix, that is the check now accounted for the
previous advance of the buffer pointer.
Platforms tested:
Linux/64 (jelly)
* Fixed typo
* Fixed HDFFV-11150
Description
Replaced an HDassert with a check for null pointer in H5O_dec_rc() to
catch null pointer in corrupted data situation.
Reversed the fix in svn-r24463 in which a check for null pointer prior
to calling H5O_dec_rc()
Platforms tested:
Linux/64 (jelly)
* HDF5 1 8 fix fortran build on macs (#186)
* Correct fortran and shared libs option
* Fix for no shared fortran build
* OESS-98 fix hdf5 link target (#191)
* Partial changes to RELEASE.txt for release. (#185)
* Partial changes to RELEASE.txt for release.
* Update supported and tested platforms.
* Update version to 1.8.22-12.
* close #195. (#196)
* Update HDF5PluginMacros.cmake
* Update HDF5PluginMacros.cmake
* Update directory for SZ filter in HDF5PluginMacros.cmake.
Updates for release:
Switch configure default to production mode.
Set HDF5_GENERATE_HEADERS to OFF.
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Restores maintainer mode in the autotools (#200) (#203)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
* Hdf5 1 8 22 (#212)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Brings ttsafe_attr_vlen.c changes from develop (#214)
Fixes exposed pthread problem on Windows.
* Update SO numbers for Hdf5 1 8 22 (#215)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Hdf5 1 8 22 (#224)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
* Update CMake/HDF5Examples version in bin/release
* Update CMake/HDF5Examples version number in bin/release (#225)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
* Fixed typo in an error message. (#228)
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
* Bring 3 small changes from Hdf5 1.8 to 1.8.22 (#241)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
* Stat st blocks fix 1822 (#251)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
* Fixes Autotools detection of the st_blocks field in stat (#246)
* Fixes Autotools detection of the st_blocks field in stat
The Autotools and CMake will now both correctly determine if the
stat struct has the st_blocks field and set H5_HAVE_STAT_ST_BLOCKS
appropriately.
* Fixes a typo in configure.ac
* Restore lines in RELEASE.txt.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
* Stat st blocks fix 1822 (#256)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
* Fixes Autotools detection of the st_blocks field in stat (#246)
* Fixes Autotools detection of the st_blocks field in stat
The Autotools and CMake will now both correctly determine if the
stat struct has the st_blocks field and set H5_HAVE_STAT_ST_BLOCKS
appropriately.
* Fixes a typo in configure.ac
* Restore lines in RELEASE.txt.
* Updated configure with reconfigure.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
* RELEASE.txt cleanup.
* Hdf5 1 8 22 (#261)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
* RELEASE.txt cleanup.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.
* )Update version.
* Hdf5 1 8 22 (#266)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
* RELEASE.txt cleanup.
* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.
* )Update version.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
* Reverts lock/unlock callback signature to 1.8.21 version (#254)
* Reverts lock/unlock callback signature to 1.8.21 version
This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.
* Trivial whitespace fix
* Update version to 1.8.22-14.
* Hdf5 1 8 22 - Reverts lock/unlock callback signature to 1.8.21 version (#267)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
* RELEASE.txt cleanup.
* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.
* )Update version.
* Reverts lock/unlock callback signature to 1.8.21 version (#254)
* Reverts lock/unlock callback signature to 1.8.21 version
This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.
* Trivial whitespace fix
* Update version to 1.8.22-14.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
* Update version in H5public.h
* Hdf5 1 8 22 (#269)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
* RELEASE.txt cleanup.
* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.
* )Update version.
* Reverts lock/unlock callback signature to 1.8.21 version (#254)
* Reverts lock/unlock callback signature to 1.8.21 version
This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.
* Trivial whitespace fix
* Update version to 1.8.22-14.
* Update version in H5public.h
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
* Set version 1.8.22 for release.
* dd RELEASE.txt entry for HDFFV-10741.
* Hdf5 1 8 22 (#279)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
* RELEASE.txt cleanup.
* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.
* )Update version.
* Reverts lock/unlock callback signature to 1.8.21 version (#254)
* Reverts lock/unlock callback signature to 1.8.21 version
This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.
* Trivial whitespace fix
* Update version to 1.8.22-14.
* Update version in H5public.h
* Set version 1.8.22 for release.
* dd RELEASE.txt entry for HDFFV-10741.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
* Improve performance of multiple calls to H5Sget_select_elem_pointlist (#270) (#277)
* Cache the pointer to the next point to process after the last call to
H5S__get_select_elem_pointlist. This allows the normal process of
iterating over the points in batches to be much more efficient, as the
library does not need to traverse the entirety of the preceding points
every time the funciton is re-entered.
* Update RELEASE.txt for point selection iteration performance fix.
* Hdf5 1 8 22 (#281)
* Restores maintainer mode in the autotools (#200)
Maintainer mode should be enabled in development branches.
Also adds helpful commenting.
Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c
* Update configure for Restores maintainer mode in the autotools (#200).
* Update MANIFEST for switch_maint_mode script.
* Update so numbers for 1.8.22 release.
* Add so numbers changes in Makefile.ins for 1.8.22 release.
* Update pkgconfig settings with version - #218 (#223)
* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".
* Update 1.8 final release notice.
* Update CMake/HDF5Examples version in bin/release
* Fixed typo in an error message. (#227)
* Remove duplicate setting (#239)
* RELEASE.txt cleanup.
* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.
* )Update version.
* Reverts lock/unlock callback signature to 1.8.21 version (#254)
* Reverts lock/unlock callback signature to 1.8.21 version
This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.
* Trivial whitespace fix
* Update version to 1.8.22-14.
* Update version in H5public.h
* Set version 1.8.22 for release.
* dd RELEASE.txt entry for HDFFV-10741.
* Improve performance of multiple calls to H5Sget_select_elem_pointlist (#270) (#277)
* Cache the pointer to the next point to process after the last call to
H5S__get_select_elem_pointlist. This allows the normal process of
iterating over the points in batches to be much more efficient, as the
library does not need to traverse the entirety of the preceding points
every time the funciton is re-entered.
* Update RELEASE.txt for point selection iteration performance fix.
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
Co-authored-by: Neil Fortner <nfortne2@hdfgroup.org>
* Hdf5 1 8 22 (#284)
* Fixed typo in an error message.
* Updated for HDFFV-11150, HDFFV-10480, and HDFFV-11159
* Update "Support for New Platforms and Compilers" section in RELEASE.txt;
add check_version workaround for binary compatibility to "Known
Problems".
* Add SUSE Linux to tested platforms.
* Update numbers in config/lt_vers.am and run bin/reconfigure for so
numbers.
* Update version in 3 files missed by merge.
Co-authored-by: Allen Byrne <byrn@hdfgroup.org>
Co-authored-by: Vailin Choi <vchoi@hdfgroup.org>
Co-authored-by: vchoi <vchoi@jelly.ad.hdfgroup.org>
Co-authored-by: hdftest <hdftest@hdfgroup.org>
Co-authored-by: Jordan Henderson <jhenderson@hdfgroup.org>
Co-authored-by: Dana Robinson <derobins@hdfgroup.org>
Co-authored-by: Binh-Minh Ribler <bmribler@hdfgroup.org>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Neil Fortner <nfortne2@hdfgroup.org>
Diffstat (limited to 'test/unlink.c')
| -rw-r--r-- | test/unlink.c | 2547 |
1 files changed, 1537 insertions, 1010 deletions
diff --git a/test/unlink.c b/test/unlink.c index 1275c3e..ce00b98 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -6,7 +6,7 @@ * This file is part of HDF5. The full HDF5 copyright notice, including * * terms governing use, modification, and redistribution, is contained in * * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * + * distribution tree, or in https://www.hdfgroup.org/licenses. * * If you do not have access to either file, you may request a copy from * * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -15,81 +15,68 @@ * Programmer: Robb Matzke <matzke@llnl.gov> * Friday, September 25, 1998 * - * Purpose: Test unlinking operations. + * Purpose: Test unlinking operations. */ -#define H5G_PACKAGE /*suppress error about including H5Gpkg */ +#define H5G_PACKAGE /*suppress error about including H5Gpkg */ /* Define this macro to indicate that the testing APIs should be available */ #define H5G_TESTING -#include <time.h> #include "h5test.h" -#include "H5Gpkg.h" /* Groups */ - -const char *FILENAME[] = { - "unlink", - "new_move_a", - "new_move_b", - "lunlink", - "filespace", - "slashes", - "resurrect_set", - "resurrect_type", - "resurrect_group", - "unlink_chunked", - "full_group", - NULL -}; +#include "H5Gpkg.h" /* Groups */ + +const char *FILENAME[] = {"unlink", "new_move_a", "new_move_b", "lunlink", + "filespace", "slashes", "resurrect_set", "resurrect_type", + "resurrect_group", "unlink_chunked", "full_group", NULL}; /* Macros for test_create_unlink() & test_filespace */ -#define GROUPNAME "group" -#define GROUP2NAME "group2" -#define UNLINK_NGROUPS 1000 -#define DATASETNAME "dataset" -#define DATASET2NAME "dataset2" -#define ATTRNAME "attribute" -#define TYPENAME "datatype" -#define TYPE2NAME "datatype2" -#define FILESPACE_NDIMS 3 -#define FILESPACE_DIM0 20 -#define FILESPACE_DIM1 20 -#define FILESPACE_DIM2 20 -#define FILESPACE_CHUNK0 10 -#define FILESPACE_CHUNK1 10 -#define FILESPACE_CHUNK2 10 -#define FILESPACE_DEFLATE_LEVEL 6 -#define FILESPACE_REWRITE 10 -#define FILESPACE_NATTR 100 -#define FILESPACE_ATTR_NDIMS 2 -#define FILESPACE_ATTR_DIM0 5 -#define FILESPACE_ATTR_DIM1 5 -#define FILESPACE_TOP_GROUPS 10 -#define FILESPACE_NESTED_GROUPS 50 -#define FILESPACE_NDATASETS 50 -#define SLASHES_GROUP_NAME "Group///" -#define SLASHES_HARDLINK_NAME "Hard///" -#define SLASHES_SOFTLINK_NAME "Soft///" -#define SLASHES_SOFTLINK2_NAME "Soft2///" -#define SLASHES_ROOTLINK_NAME "Root///" -#define FULL_GROUP_NUM_KEEP 2 -#define FULL_GROUP_NUM_DELETE_COMPACT 2 -#define FULL_GROUP_NUM_DELETE_DENSE 16 -#define FULL_GROUP_EST_NUM_ENTRIES 8 -#define FULL_GROUP_EST_ENTRY_LEN 9 - - +#define GROUPNAME "group" +#define GROUP2NAME "group2" +#define UNLINK_NGROUPS 1000 +#define DATASETNAME "dataset" +#define DATASET2NAME "dataset2" +#define ATTRNAME "attribute" +#define TYPENAME "datatype" +#define TYPE2NAME "datatype2" +#define FILESPACE_NDIMS 3 +#define FILESPACE_DIM0 20 +#define FILESPACE_DIM1 20 +#define FILESPACE_DIM2 20 +#define FILESPACE_CHUNK0 10 +#define FILESPACE_CHUNK1 10 +#define FILESPACE_CHUNK2 10 +#define FILESPACE_DEFLATE_LEVEL 6 +#define FILESPACE_REWRITE 10 +#define FILESPACE_NATTR 100 +#define FILESPACE_ATTR_NDIMS 2 +#define FILESPACE_ATTR_DIM0 5 +#define FILESPACE_ATTR_DIM1 5 +#define FILESPACE_TOP_GROUPS 10 +#define FILESPACE_NESTED_GROUPS 50 +#define FILESPACE_NDATASETS 50 +#define SLASHES_GROUP_NAME "Group///" +#define SLASHES_HARDLINK_NAME "Hard///" +#define SLASHES_SOFTLINK_NAME "Soft///" +#define SLASHES_SOFTLINK2_NAME "Soft2///" +#define SLASHES_ROOTLINK_NAME "Root///" +#define FULL_GROUP_NUM_KEEP 2 +#define FULL_GROUP_NUM_DELETE_COMPACT 2 +#define FULL_GROUP_NUM_DELETE_DENSE 16 +#define FULL_GROUP_EST_NUM_ENTRIES 8 +#define FULL_GROUP_EST_ENTRY_LEN 9 + /*------------------------------------------------------------------------- - * Function: test_one + * Function: test_one * - * Purpose: Creates a group that has just one entry and then unlinks that - * entry. + * Purpose: Creates a group that has just one entry and then unlinks that + * entry. * - * Return: Success: 0 + * Return: Success: 0 * - * Failure: number of errors + * Failure: number of errors * - * Programmer: Robb Matzke + * Programmer: Robb Matzke * Friday, September 25, 1998 * * Modifications: @@ -99,61 +86,71 @@ const char *FILENAME[] = { static int test_one(hid_t file) { - hid_t work = -1, grp = -1; - herr_t status; + hid_t work = -1, grp = -1; + herr_t status; /* Create a test group */ - if((work = H5Gcreate2(file, "/test_one", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((work = H5Gcreate2(file, "/test_one", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Delete by absolute name */ TESTING("unlink by absolute name"); - if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(grp) < 0) FAIL_STACK_ERROR - if(H5Ldelete(file, "/test_one/foo", H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if ((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(grp) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(file, "/test_one/foo", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR PASSED(); /* Delete by local name */ TESTING("unlink by local name"); - if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(grp) < 0) FAIL_STACK_ERROR - if(H5Ldelete(work, "foo", H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if ((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(grp) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(work, "foo", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR PASSED(); /* Delete directly - should fail */ TESTING("unlink without a name"); - if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - H5E_BEGIN_TRY { - status = H5Ldelete(grp, ".", H5P_DEFAULT); - } H5E_END_TRY; - if(status>=0) - FAIL_PUTS_ERROR(" Unlinking object w/o a name should have failed.") - if(H5Gclose(grp) < 0) FAIL_STACK_ERROR + if ((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + H5E_BEGIN_TRY { status = H5Ldelete(grp, ".", H5P_DEFAULT); } + H5E_END_TRY; + if (status >= 0) + FAIL_PUTS_ERROR(" Unlinking object w/o a name should have failed.") + if (H5Gclose(grp) < 0) + FAIL_STACK_ERROR /* Cleanup */ - if(H5Gclose(work) < 0) FAIL_STACK_ERROR + if (H5Gclose(work) < 0) + FAIL_STACK_ERROR PASSED(); return 0; - error: - H5E_BEGIN_TRY { - H5Gclose(work); - H5Gclose(grp); - } H5E_END_TRY; +error: + H5E_BEGIN_TRY + { + H5Gclose(work); + H5Gclose(grp); + } + H5E_END_TRY; return 1; } /* end test_one() */ - /*------------------------------------------------------------------------- - * Function: test_many + * Function: test_many * - * Purpose: Tests many unlinks in a single directory. + * Purpose: Tests many unlinks in a single directory. * - * Return: Success: 0 + * Return: Success: 0 * - * Failure: number of errors + * Failure: number of errors * - * Programmer: Robb Matzke + * Programmer: Robb Matzke * Friday, September 25, 1998 * * Modifications: @@ -163,94 +160,106 @@ test_one(hid_t file) static int test_many(hid_t file) { - hid_t work=-1, grp=-1; - int i; - const int how_many=500; - char name[32]; + hid_t work = -1, grp = -1; + int i; + const int how_many = 500; + char name[32]; /* Create a test group */ - if((work = H5Gcreate2(file, "/test_many", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; - if((grp = H5Gcreate2(work, "/test_many_foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; - if(H5Gclose(grp) < 0) goto error; + if ((work = H5Gcreate2(file, "/test_many", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto error; + if ((grp = H5Gcreate2(work, "/test_many_foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + goto error; + if (H5Gclose(grp) < 0) + goto error; /* Create a bunch of names and unlink them in order */ TESTING("forward unlink"); - for(i = 0; i < how_many; i++) { - sprintf(name, "obj_%05d", i); - if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (i = 0; i < how_many; i++) { + HDsprintf(name, "obj_%05d", i); + if (H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ - for(i = 0; i < how_many; i++) { - sprintf(name, "obj_%05d", i); - if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (i = 0; i < how_many; i++) { + HDsprintf(name, "obj_%05d", i); + if (H5Ldelete(work, name, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ PASSED(); /* Create a bunch of names and unlink them in reverse order */ TESTING("backward unlink"); - for(i = 0; i < how_many; i++) { - sprintf(name, "obj_%05d", i); - if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (i = 0; i < how_many; i++) { + HDsprintf(name, "obj_%05d", i); + if (H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ - for(i = (how_many - 1); i >= 0; --i) { - sprintf(name, "obj_%05d", i); - if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (i = (how_many - 1); i >= 0; --i) { + HDsprintf(name, "obj_%05d", i); + if (H5Ldelete(work, name, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ PASSED(); /* Create a bunch of names and unlink them from both directions */ TESTING("inward unlink"); - for(i = 0; i < how_many; i++) { - sprintf(name, "obj_%05d", i); - if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (i = 0; i < how_many; i++) { + HDsprintf(name, "obj_%05d", i); + if (H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ - for(i = 0; i < how_many; i++) { - if(i % 2) - sprintf(name, "obj_%05d", how_many - (1 + i / 2)); - else - sprintf(name, "obj_%05d", i / 2); - if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (i = 0; i < how_many; i++) { + if (i % 2) + HDsprintf(name, "obj_%05d", how_many - (1 + i / 2)); + else + HDsprintf(name, "obj_%05d", i / 2); + if (H5Ldelete(work, name, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ PASSED(); /* Create a bunch of names and unlink them from the midle */ TESTING("outward unlink"); - for(i = 0; i < how_many; i++) { - sprintf(name, "obj_%05d", i); - if(H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (i = 0; i < how_many; i++) { + HDsprintf(name, "obj_%05d", i); + if (H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ - for(i = (how_many - 1); i >= 0; --i) { - if(i % 2) - sprintf(name, "obj_%05d", how_many - (1 + i / 2)); - else - sprintf(name, "obj_%05d", i / 2); - if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (i = (how_many - 1); i >= 0; --i) { + if (i % 2) + HDsprintf(name, "obj_%05d", how_many - (1 + i / 2)); + else + HDsprintf(name, "obj_%05d", i / 2); + if (H5Ldelete(work, name, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ PASSED(); - /* Cleanup */ - if (H5Gclose(work) < 0) goto error; + if (H5Gclose(work) < 0) + goto error; return 0; - error: - H5E_BEGIN_TRY { - H5Gclose(work); - H5Gclose(grp); - } H5E_END_TRY; +error: + H5E_BEGIN_TRY + { + H5Gclose(work); + H5Gclose(grp); + } + H5E_END_TRY; return 1; } - /*------------------------------------------------------------------------- - * Function: test_symlink + * Function: test_symlink * - * Purpose: Tests removal of symbolic links. + * Purpose: Tests removal of symbolic links. * - * Return: Success: 0 + * Return: Success: 0 * - * Failure: number of errors + * Failure: number of errors * - * Programmer: Robb Matzke + * Programmer: Robb Matzke * Friday, September 25, 1998 * *------------------------------------------------------------------------- @@ -258,39 +267,41 @@ test_many(hid_t file) static int test_symlink(hid_t file) { - hid_t work=-1; + hid_t work = -1; TESTING("symlink removal"); /* Create a test group and symlink */ - if((work = H5Gcreate2(file, "/test_symlink", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Lcreate_soft("link_value", work, "link", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(work, "link", H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if ((work = H5Gcreate2(file, "/test_symlink", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Lcreate_soft("link_value", work, "link", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(work, "link", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Cleanup */ - if(H5Gclose(work) < 0) FAIL_STACK_ERROR + if (H5Gclose(work) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Gclose(work); - } H5E_END_TRY; + H5E_BEGIN_TRY { H5Gclose(work); } + H5E_END_TRY; return 1; } /* end test_symlink() */ - /*------------------------------------------------------------------------- - * Function: test_rename + * Function: test_rename * - * Purpose: Tests H5Lmove() + * Purpose: Tests H5Lmove() * - * Return: Success: 0 + * Return: Success: 0 * - * Failure: number of errors + * Failure: number of errors * - * Programmer: Robb Matzke + * Programmer: Robb Matzke * Friday, September 25, 1998 * * Modifications: @@ -300,41 +311,53 @@ error: static int test_rename(hid_t file) { - hid_t work=-1, foo=-1, inner=-1; + hid_t work = -1, foo = -1, inner = -1; /* Create a test group and rename something */ TESTING("object renaming"); - if((work = H5Gcreate2(file, "/test_rename", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((foo = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Lmove(work, "foo", H5L_SAME_LOC, "bar", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if((inner = H5Gcreate2(foo, "inner", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(inner) < 0) FAIL_STACK_ERROR - if(H5Gclose(foo) < 0) FAIL_STACK_ERROR - if((inner = H5Gopen2(work, "bar/inner", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(inner) < 0) FAIL_STACK_ERROR + if ((work = H5Gcreate2(file, "/test_rename", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if ((foo = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Lmove(work, "foo", H5L_SAME_LOC, "bar", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if ((inner = H5Gcreate2(foo, "inner", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(inner) < 0) + FAIL_STACK_ERROR + if (H5Gclose(foo) < 0) + FAIL_STACK_ERROR + if ((inner = H5Gopen2(work, "bar/inner", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(inner) < 0) + FAIL_STACK_ERROR PASSED(); /* Try renaming a symlink */ TESTING("symlink renaming"); - if(H5Lcreate_soft("link_value", work, "link_one", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Lmove(work, "link_one", H5L_SAME_LOC, "link_two", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_soft("link_value", work, "link_one", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Lmove(work, "link_one", H5L_SAME_LOC, "link_two", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Cleanup */ - if (H5Gclose(work) < 0) FAIL_STACK_ERROR + if (H5Gclose(work) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Gclose(work); - H5Gclose(foo); - H5Gclose(inner); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Gclose(work); + H5Gclose(foo); + H5Gclose(inner); + } + H5E_END_TRY; return 1; } /* end test_rename() */ - /*------------------------------------------------------------------------- * Function: test_new_move * @@ -354,67 +377,90 @@ error: static int test_new_move(hid_t fapl) { - hid_t file_a, file_b=(-1); - hid_t grp_1=(-1), grp_2=(-1), grp_move=(-1), moved_grp=(-1); - char filename[1024]; + hid_t file_a, file_b = (-1); + hid_t grp_1 = (-1), grp_2 = (-1), grp_move = (-1), moved_grp = (-1); + char filename[1024]; TESTING("new move"); /* Create a second file */ h5_fixname(FILENAME[1], fapl, filename, sizeof filename); - if((file_a = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file_a = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR h5_fixname(FILENAME[2], fapl, filename, sizeof filename); - if((file_b = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file_b = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create groups in first file */ - if((grp_1 = H5Gcreate2(file_a, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((grp_2 = H5Gcreate2(file_a, "group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((grp_move = H5Gcreate2(grp_1, "group_move", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((grp_1 = H5Gcreate2(file_a, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if ((grp_2 = H5Gcreate2(file_a, "group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if ((grp_move = H5Gcreate2(grp_1, "group_move", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create hard and soft links. */ - if(H5Lcreate_hard(grp_1, "group_move", H5L_SAME_LOC, "hard", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Lcreate_soft("/group1/group_move", grp_2, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(grp_1, "group_move", H5L_SAME_LOC, "hard", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Lcreate_soft("/group1/group_move", grp_2, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Move a group within the file. Both of source and destination use * H5L_SAME_LOC. Should fail. */ - H5E_BEGIN_TRY { - if(H5Lmove(H5L_SAME_LOC, "group_move", H5L_SAME_LOC, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL) TEST_ERROR - } H5E_END_TRY; + H5E_BEGIN_TRY + { + if (H5Lmove(H5L_SAME_LOC, "group_move", H5L_SAME_LOC, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != + FAIL) + TEST_ERROR + } + H5E_END_TRY; /* Move a group across files. Should fail. */ - H5E_BEGIN_TRY { - if(H5Lmove(grp_1, "group_move", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL) TEST_ERROR - } H5E_END_TRY; + H5E_BEGIN_TRY + { + if (H5Lmove(grp_1, "group_move", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL) + TEST_ERROR + } + H5E_END_TRY; /* Move a group across groups in the same file. */ - if(H5Lmove(grp_1, "group_move", grp_2, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lmove(grp_1, "group_move", grp_2, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Open the group just moved to the new location. */ - if((moved_grp = H5Gopen2(grp_2, "group_new_name", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((moved_grp = H5Gopen2(grp_2, "group_new_name", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR - if(H5Gclose(grp_1) < 0) FAIL_STACK_ERROR - if(H5Gclose(grp_2) < 0) FAIL_STACK_ERROR - if(H5Gclose(grp_move) < 0) FAIL_STACK_ERROR - if(H5Gclose(moved_grp) < 0) FAIL_STACK_ERROR - if(H5Fclose(file_a) < 0) FAIL_STACK_ERROR - if(H5Fclose(file_b) < 0) FAIL_STACK_ERROR + if (H5Gclose(grp_1) < 0) + FAIL_STACK_ERROR + if (H5Gclose(grp_2) < 0) + FAIL_STACK_ERROR + if (H5Gclose(grp_move) < 0) + FAIL_STACK_ERROR + if (H5Gclose(moved_grp) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file_a) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file_b) < 0) + FAIL_STACK_ERROR PASSED(); return 0; - error: - H5E_BEGIN_TRY { - H5Gclose(grp_1); - H5Gclose(grp_2); - H5Gclose(grp_move); +error: + H5E_BEGIN_TRY + { + H5Gclose(grp_1); + H5Gclose(grp_2); + H5Gclose(grp_move); H5Gclose(moved_grp); - H5Fclose(file_a); - H5Fclose(file_b); - } H5E_END_TRY; + H5Fclose(file_a); + H5Fclose(file_b); + } + H5E_END_TRY; return 1; } - /*------------------------------------------------------------------------- * Function: check_new_move * @@ -434,38 +480,39 @@ test_new_move(hid_t fapl) static int check_new_move(hid_t fapl) { - hid_t file; - H5O_info_t oi_hard1, oi_hard2; - char filename[1024]; - char linkval[1024]; + hid_t file; + H5O_info_t oi_hard1, oi_hard2; + char filename[1024]; + char linkval[1024]; TESTING("check new move function"); /* Open file */ h5_fixname(FILENAME[1], fapl, filename, sizeof filename); - if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) + if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR /* Get hard link info */ - if(H5Oget_info_by_name(file, "/group2/group_new_name", &oi_hard1, H5P_DEFAULT) < 0) + if (H5Oget_info_by_name(file, "/group2/group_new_name", &oi_hard1, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Oget_info_by_name(file, "/group1/hard", &oi_hard2, H5P_DEFAULT) < 0) + if (H5Oget_info_by_name(file, "/group1/hard", &oi_hard2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR /* Check hard links */ - if(H5O_TYPE_GROUP != oi_hard1.type || H5O_TYPE_GROUP != oi_hard2.type) + if (H5O_TYPE_GROUP != oi_hard1.type || H5O_TYPE_GROUP != oi_hard2.type) FAIL_PUTS_ERROR(" Unexpected object type, should have been a group") - if(H5F_addr_ne(oi_hard1.addr, oi_hard2.addr)) + if (H5F_addr_ne(oi_hard1.addr, oi_hard2.addr)) FAIL_PUTS_ERROR(" Hard link test failed. Link seems not to point to the expected file location.") /* Check soft links */ - if(H5Lget_val(file, "group2/soft", linkval, sizeof linkval, H5P_DEFAULT) < 0) + if (H5Lget_val(file, "group2/soft", linkval, sizeof linkval, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(HDstrcmp(linkval, "/group1/group_move")) + if (HDstrcmp(linkval, "/group1/group_move")) FAIL_PUTS_ERROR(" Soft link test failed. Wrong link value") /* Cleanup */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR PASSED(); return 0; @@ -474,7 +521,6 @@ error: return 1; } /* end check_new_move() */ - /*------------------------------------------------------------------------- * Function: test_filespace * @@ -493,33 +539,35 @@ error: static int test_filespace(hid_t fapl) { - hid_t fapl_nocache; /* File access property list with raw data cache turned off */ - hid_t contig_dcpl; /* Dataset creation property list for contiguous dataset */ - hid_t early_chunk_dcpl; /* Dataset creation property list for chunked dataset & early allocation */ - hid_t late_chunk_dcpl; /* Dataset creation property list for chunked dataset & late allocation */ - hid_t comp_dcpl; /* Dataset creation property list for compressed, chunked dataset */ - hid_t compact_dcpl; /* Dataset creation property list for compact dataset */ - hid_t file; /* File ID */ - hid_t group, group2; /* Group IDs */ - hid_t dataset, dataset2; /* Dataset IDs */ - hid_t space; /* Dataspace ID */ - hid_t type; /* Datatype ID */ - hid_t attr_space; /* Dataspace ID for attributes */ - hid_t attr; /* Attribute ID */ - char filename[1024]; /* Name of file to create */ - char objname[128]; /* Name of object to create */ - hsize_t dims[FILESPACE_NDIMS]= {FILESPACE_DIM0, FILESPACE_DIM1, FILESPACE_DIM2}; /* Dataset dimensions */ - hsize_t chunk_dims[FILESPACE_NDIMS]= {FILESPACE_CHUNK0, FILESPACE_CHUNK1, FILESPACE_CHUNK2}; /* Chunk dimensions */ - hsize_t attr_dims[FILESPACE_ATTR_NDIMS]= {FILESPACE_ATTR_DIM0, FILESPACE_ATTR_DIM1}; /* Attribute dimensions */ - int *data = NULL; /* Pointer to dataset buffer */ - int *tmp_data; /* Temporary pointer to dataset buffer */ - h5_stat_size_t empty_size; /* Size of an empty file */ - h5_stat_size_t file_size; /* Size of each file created */ - herr_t status; /* Function status return value */ - unsigned u,v,w; /* Local index variables */ + hid_t fapl_nocache; /* File access property list with raw data cache turned off */ + hid_t contig_dcpl; /* Dataset creation property list for contiguous dataset */ + hid_t early_chunk_dcpl; /* Dataset creation property list for chunked dataset & early allocation */ + hid_t late_chunk_dcpl; /* Dataset creation property list for chunked dataset & late allocation */ + hid_t comp_dcpl; /* Dataset creation property list for compressed, chunked dataset */ + hid_t compact_dcpl; /* Dataset creation property list for compact dataset */ + hid_t file; /* File ID */ + hid_t group, group2; /* Group IDs */ + hid_t dataset, dataset2; /* Dataset IDs */ + hid_t space; /* Dataspace ID */ + hid_t type; /* Datatype ID */ + hid_t attr_space; /* Dataspace ID for attributes */ + hid_t attr; /* Attribute ID */ + char filename[1024]; /* Name of file to create */ + char objname[128]; /* Name of object to create */ + hsize_t dims[FILESPACE_NDIMS] = {FILESPACE_DIM0, FILESPACE_DIM1, FILESPACE_DIM2}; /* Dataset dimensions */ + hsize_t chunk_dims[FILESPACE_NDIMS] = {FILESPACE_CHUNK0, FILESPACE_CHUNK1, + FILESPACE_CHUNK2}; /* Chunk dimensions */ + hsize_t attr_dims[FILESPACE_ATTR_NDIMS] = {FILESPACE_ATTR_DIM0, + FILESPACE_ATTR_DIM1}; /* Attribute dimensions */ + int * data = NULL; /* Pointer to dataset buffer */ + int * tmp_data; /* Temporary pointer to dataset buffer */ + h5_stat_size_t empty_size; /* Size of an empty file */ + h5_stat_size_t file_size; /* Size of each file created */ + herr_t status; /* Function status return value */ + unsigned u, v, w; /* Local index variables */ /* Metadata cache parameters */ - int mdc_nelmts; + int mdc_nelmts; size_t rdcc_nelmts; size_t rdcc_nbytes; double rdcc_w0; @@ -529,697 +577,871 @@ test_filespace(hid_t fapl) /* Open file */ h5_fixname(FILENAME[4], fapl, filename, sizeof filename); -/* Create FAPL with raw data cache disabled */ + /* Create FAPL with raw data cache disabled */ /* Create file access property list with raw data cache disabled */ - if ((fapl_nocache=H5Pcopy(fapl)) < 0) TEST_ERROR + if ((fapl_nocache = H5Pcopy(fapl)) < 0) + TEST_ERROR /* Get the cache settings */ - if(H5Pget_cache(fapl_nocache,&mdc_nelmts,&rdcc_nelmts,&rdcc_nbytes,&rdcc_w0) < 0) TEST_ERROR + if (H5Pget_cache(fapl_nocache, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0) < 0) + TEST_ERROR /* Disable the raw data cache */ - rdcc_nelmts=0; - rdcc_nbytes=0; - if(H5Pset_cache(fapl_nocache,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0) < 0) TEST_ERROR + rdcc_nelmts = 0; + rdcc_nbytes = 0; + if (H5Pset_cache(fapl_nocache, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0) < 0) + TEST_ERROR -/* Create empty file for size comparisons later */ + /* Create empty file for size comparisons later */ /* Create file */ - if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + TEST_ERROR /* Close file */ - if(H5Fclose(file) < 0) TEST_ERROR + if (H5Fclose(file) < 0) + TEST_ERROR /* Get the size of an empty file */ - if((empty_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((empty_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR -/* Create common objects for datasets */ + /* Create common objects for datasets */ /* Create dataset creation property list for contigous storage */ - if ((contig_dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR + if ((contig_dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR /* Make certain that space is allocated early */ - if(H5Pset_alloc_time(contig_dcpl, H5D_ALLOC_TIME_EARLY) < 0) TEST_ERROR + if (H5Pset_alloc_time(contig_dcpl, H5D_ALLOC_TIME_EARLY) < 0) + TEST_ERROR /* Create dataset creation property list for chunked storage & early allocation */ - if ((early_chunk_dcpl=H5Pcopy(contig_dcpl)) < 0) TEST_ERROR + if ((early_chunk_dcpl = H5Pcopy(contig_dcpl)) < 0) + TEST_ERROR /* Set chunk dimensions */ - if(H5Pset_chunk(early_chunk_dcpl, FILESPACE_NDIMS, chunk_dims) < 0) TEST_ERROR + if (H5Pset_chunk(early_chunk_dcpl, FILESPACE_NDIMS, chunk_dims) < 0) + TEST_ERROR /* Create dataset creation property list for chunked storage & late allocation */ - if ((late_chunk_dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR + if ((late_chunk_dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR /* Set chunk dimensions */ - if(H5Pset_chunk(late_chunk_dcpl, FILESPACE_NDIMS, chunk_dims) < 0) TEST_ERROR + if (H5Pset_chunk(late_chunk_dcpl, FILESPACE_NDIMS, chunk_dims) < 0) + TEST_ERROR /* Create dataset creation property list for compressed, chunked storage & early allocation */ - if ((comp_dcpl=H5Pcopy(early_chunk_dcpl)) < 0) TEST_ERROR + if ((comp_dcpl = H5Pcopy(early_chunk_dcpl)) < 0) + TEST_ERROR /* Enable compression & set level */ - if(H5Pset_deflate(comp_dcpl, FILESPACE_DEFLATE_LEVEL) < 0) TEST_ERROR + if (H5Pset_deflate(comp_dcpl, FILESPACE_DEFLATE_LEVEL) < 0) + TEST_ERROR /* Create dataset creation property list for compact storage */ - if ((compact_dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR + if ((compact_dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR /* Set to compact storage */ - if(H5Pset_layout(compact_dcpl, H5D_COMPACT) < 0) TEST_ERROR + if (H5Pset_layout(compact_dcpl, H5D_COMPACT) < 0) + TEST_ERROR /* Create dataspace for datasets */ - if((space = H5Screate_simple(FILESPACE_NDIMS, dims, NULL)) < 0) TEST_ERROR + if ((space = H5Screate_simple(FILESPACE_NDIMS, dims, NULL)) < 0) + TEST_ERROR /* Create buffer for writing dataset */ - if(NULL == (data = (int *)HDmalloc(sizeof(int) * FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2))) TEST_ERROR - + if (NULL == (data = (int *)HDmalloc(sizeof(int) * FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2))) + TEST_ERROR -/* Create single dataset (with contiguous storage & late allocation), remove it & verify file size */ + /* Create single dataset (with contiguous storage & late allocation), remove it & verify file size */ TESTING(" contiguous dataset with late allocation"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + if ((dataset = + H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR /* Remove the dataset */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create single dataset (with contiguous storage & early allocation), remove it & verify file size */ + /* Create single dataset (with contiguous storage & early allocation), remove it & verify file size */ TESTING(" contiguous dataset with early allocation"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, contig_dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + if ((dataset = + H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, contig_dcpl, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR /* Remove the dataset */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create single dataset (with chunked storage & late allocation), remove it & verify file size */ + /* Create single dataset (with chunked storage & late allocation), remove it & verify file size */ TESTING(" chunked dataset with late allocation"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, late_chunk_dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + if ((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, late_chunk_dcpl, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR /* Remove the dataset */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create single dataset (with chunked storage & early allocation), remove it & verify file size */ + /* Create single dataset (with chunked storage & early allocation), remove it & verify file size */ TESTING(" chunked dataset with early allocation"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, early_chunk_dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + if ((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, early_chunk_dcpl, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR /* Remove the dataset */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create single dataset (with compressed storage & early allocation), remove it & verify file size */ + /* Create single dataset (with compressed storage & early allocation), remove it & verify file size */ TESTING(" compressed, chunked dataset"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, comp_dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + if ((dataset = + H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, comp_dcpl, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR /* Remove the dataset */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create single dataset (with compressed storage & early allocation), re-write it a bunch of - * times (which should re-allocate blocks many times) and remove it & verify - * file size. - */ + /* Create single dataset (with compressed storage & early allocation), re-write it a bunch of + * times (which should re-allocate blocks many times) and remove it & verify + * file size. + */ TESTING(" re-writing compressed, chunked dataset"); /* Create file (using FAPL with disabled raw data cache) */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_nocache)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_nocache)) < 0) + FAIL_STACK_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, comp_dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((dataset = + H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, comp_dcpl, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Alternate re-writing dataset with compressible & random data */ - for(u = 0; u < FILESPACE_REWRITE; u++) { + for (u = 0; u < FILESPACE_REWRITE; u++) { /* Set buffer to some compressible values */ - for(v = 0, tmp_data = data; v < (FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2); v++) + for (v = 0, tmp_data = data; v < (FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2); v++) *tmp_data++ = (int)(v * u); /* Write the buffer to the dataset */ - if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR + if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + FAIL_STACK_ERROR /* Set buffer to different random numbers each time */ - for(v = 0, tmp_data = data; v < (FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2); v++) + for (v = 0, tmp_data = data; v < (FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2); v++) *tmp_data++ = (int)HDrandom(); /* Write the buffer to the dataset */ - if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR + if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close dataset */ - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR /* Remove the dataset */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl_nocache)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl_nocache)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create single dataset (with compact storage), remove it & verify file size */ + /* Create single dataset (with compact storage), remove it & verify file size */ TESTING(" compact dataset"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, compact_dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + if ((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, compact_dcpl, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR /* Remove the dataset */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create two datasets (with contiguous storage), alternate adding attributes - * to each one (which creates many object header continuations), - * remove both & verify file size. - */ + /* Create two datasets (with contiguous storage), alternate adding attributes + * to each one (which creates many object header continuations), + * remove both & verify file size. + */ TESTING(" object header continuations"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create datasets to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, contig_dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((dataset2 = H5Dcreate2(file, DATASET2NAME, H5T_NATIVE_INT, space, H5P_DEFAULT, contig_dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((dataset = + H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, contig_dcpl, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if ((dataset2 = H5Dcreate2(file, DATASET2NAME, H5T_NATIVE_INT, space, H5P_DEFAULT, contig_dcpl, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create a dataspace for the attributes */ - if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) FAIL_STACK_ERROR + if ((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) + FAIL_STACK_ERROR /* Alternate adding attributes to each one */ - for(u = 0; u < FILESPACE_NATTR; u++) { + for (u = 0; u < FILESPACE_NATTR; u++) { /* Set the name of the attribute to create */ - sprintf(objname,"%s %u",ATTRNAME,u); + HDsprintf(objname, "%s %u", ATTRNAME, u); /* Create an attribute on the first dataset */ - if((attr = H5Acreate2(dataset, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((attr = H5Acreate2(dataset, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Don't worry about writing the attribute - it will have a fill value */ /* Close the attribute on the first dataset */ - if(H5Aclose(attr) < 0) FAIL_STACK_ERROR + if (H5Aclose(attr) < 0) + FAIL_STACK_ERROR /* Create an attribute on the second dataset */ - if((attr = H5Acreate2(dataset2, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((attr = H5Acreate2(dataset2, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Don't worry about writing the attribute - it will have a fill value */ /* Close the attribute on the second dataset */ - if(H5Aclose(attr) < 0) FAIL_STACK_ERROR + if (H5Aclose(attr) < 0) + FAIL_STACK_ERROR /* Flush the file (to fix the sizes of object header buffers, etc) */ - if(H5Fflush(file,H5F_SCOPE_GLOBAL) < 0) FAIL_STACK_ERROR + if (H5Fflush(file, H5F_SCOPE_GLOBAL) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close the dataspace for the attributes */ - if(H5Sclose(attr_space) < 0) FAIL_STACK_ERROR + if (H5Sclose(attr_space) < 0) + FAIL_STACK_ERROR /* Close datasets */ - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR - if(H5Dclose(dataset2) < 0) FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dataset2) < 0) + FAIL_STACK_ERROR /* Remove the datasets */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(file, DATASET2NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(file, DATASET2NAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create single named datatype, remove it & verify file size */ + /* Create single named datatype, remove it & verify file size */ TESTING(" named datatype"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create datatype to commit */ - if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + FAIL_STACK_ERROR /* Create a single named datatype to remove */ - if(H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Tclose(type) < 0) FAIL_STACK_ERROR + if (H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Tclose(type) < 0) + FAIL_STACK_ERROR /* Remove the named datatype */ - if(H5Ldelete(file, TYPENAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, TYPENAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create single group, remove it & verify file size */ + /* Create single group, remove it & verify file size */ TESTING(" single group"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a single group to remove */ - if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(group) < 0) FAIL_STACK_ERROR + if ((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(group) < 0) + FAIL_STACK_ERROR /* Remove the group */ - if(H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create many groups, remove them & verify file size */ + /* Create many groups, remove them & verify file size */ TESTING(" multiple groups"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a many groups to remove */ - for(u = 0; u < UNLINK_NGROUPS; u++) { - sprintf(objname, "%s %u", GROUPNAME, u); - if((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(group) < 0) FAIL_STACK_ERROR + for (u = 0; u < UNLINK_NGROUPS; u++) { + HDsprintf(objname, "%s %u", GROUPNAME, u); + if ((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(group) < 0) + FAIL_STACK_ERROR } /* end for */ /* Remove the all the groups */ /* (Remove them in reverse order just to make file size calculation easier -QAK) */ - for(u = UNLINK_NGROUPS; u > 0; u--) { - sprintf(objname, "%s %u", GROUPNAME, (u - 1)); - if(H5Ldelete(file, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (u = UNLINK_NGROUPS; u > 0; u--) { + HDsprintf(objname, "%s %u", GROUPNAME, (u - 1)); + if (H5Ldelete(file, objname, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create simple group hiearchy, remove it & verify file size */ + /* Create simple group hiearchy, remove it & verify file size */ TESTING(" simple group hierarchy"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a small group hierarchy to remove */ - if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((group2 = H5Gcreate2(group, GROUP2NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(group2) < 0) FAIL_STACK_ERROR - if(H5Gclose(group) < 0) FAIL_STACK_ERROR + if ((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if ((group2 = H5Gcreate2(group, GROUP2NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(group2) < 0) + FAIL_STACK_ERROR + if (H5Gclose(group) < 0) + FAIL_STACK_ERROR /* Remove the second group */ - if(H5Ldelete(file, GROUPNAME "/" GROUP2NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, GROUPNAME "/" GROUP2NAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Remove the first group */ - if(H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create complex group hiearchy, remove it & verify file size */ + /* Create complex group hiearchy, remove it & verify file size */ TESTING(" complex group hierarchy"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a complex group hierarchy to remove */ - for(u = 0; u < FILESPACE_TOP_GROUPS; u++) { + for (u = 0; u < FILESPACE_TOP_GROUPS; u++) { /* Create group */ - sprintf(objname,"%s %u",GROUPNAME,u); - if((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + HDsprintf(objname, "%s %u", GROUPNAME, u); + if ((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create nested groups inside top groups */ - for(v = 0; v < FILESPACE_NESTED_GROUPS; v++) { + for (v = 0; v < FILESPACE_NESTED_GROUPS; v++) { /* Create group */ - sprintf(objname, "%s %u", GROUP2NAME, v); - if((group2 = H5Gcreate2(group, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + HDsprintf(objname, "%s %u", GROUP2NAME, v); + if ((group2 = H5Gcreate2(group, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create datasets inside nested groups */ - for(w = 0; w < FILESPACE_NDATASETS; w++) { + for (w = 0; w < FILESPACE_NDATASETS; w++) { /* Create & close a dataset */ - sprintf(objname, "%s %u", DATASETNAME, w); - if((dataset = H5Dcreate2(group2, objname, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + HDsprintf(objname, "%s %u", DATASETNAME, w); + if ((dataset = H5Dcreate2(group2, objname, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close nested group */ - if(H5Gclose(group2) < 0) FAIL_STACK_ERROR + if (H5Gclose(group2) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close top group */ - if(H5Gclose(group) < 0) FAIL_STACK_ERROR + if (H5Gclose(group) < 0) + FAIL_STACK_ERROR } /* end for */ /* Remove complex group hierarchy */ /* (Remove them in reverse order just to make file size calculation easier -QAK) */ - for(u = FILESPACE_TOP_GROUPS; u > 0; u--) { + for (u = FILESPACE_TOP_GROUPS; u > 0; u--) { /* Open group */ - sprintf(objname, "%s %u", GROUPNAME, (u - 1)); - if((group = H5Gopen2(file, objname, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + HDsprintf(objname, "%s %u", GROUPNAME, (u - 1)); + if ((group = H5Gopen2(file, objname, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Open nested groups inside top groups */ - for(v = 0; v < FILESPACE_NESTED_GROUPS; v++) { + for (v = 0; v < FILESPACE_NESTED_GROUPS; v++) { /* Create group */ - sprintf(objname, "%s %u", GROUP2NAME, v); - if((group2 = H5Gopen2(group, objname, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + HDsprintf(objname, "%s %u", GROUP2NAME, v); + if ((group2 = H5Gopen2(group, objname, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Remove datasets inside nested groups */ - for(w = 0; w < FILESPACE_NDATASETS; w++) { + for (w = 0; w < FILESPACE_NDATASETS; w++) { /* Remove dataset */ - sprintf(objname, "%s %u", DATASETNAME, w); - if(H5Ldelete(group2, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + HDsprintf(objname, "%s %u", DATASETNAME, w); + if (H5Ldelete(group2, objname, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close nested group */ - if(H5Gclose(group2) < 0) FAIL_STACK_ERROR + if (H5Gclose(group2) < 0) + FAIL_STACK_ERROR /* Remove nested group */ - sprintf(objname, "%s %u",GROUP2NAME, v); - if(H5Ldelete(group, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + HDsprintf(objname, "%s %u", GROUP2NAME, v); + if (H5Ldelete(group, objname, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close top group */ - if(H5Gclose(group) < 0) FAIL_STACK_ERROR + if (H5Gclose(group) < 0) + FAIL_STACK_ERROR /* Remove top group */ - sprintf(objname, "%s %u", GROUPNAME, (u - 1)); - if(H5Ldelete(file, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + HDsprintf(objname, "%s %u", GROUPNAME, (u - 1)); + if (H5Ldelete(file, objname, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create dataset and duplicate dataset, remove original & verify file size */ + /* Create dataset and duplicate dataset, remove original & verify file size */ TESTING(" duplicate dataset"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a single dataset to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + if ((dataset = + H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR /* Create another dataset with same name */ - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(dataset >= 0) { + } + H5E_END_TRY; + if (dataset >= 0) { H5Dclose(dataset); TEST_ERROR } /* end if */ /* Remove the dataset */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create group and duplicate group, remove original & verify file size */ + /* Create group and duplicate group, remove original & verify file size */ TESTING(" duplicate group"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a single group to remove */ - if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(group) < 0) FAIL_STACK_ERROR + if ((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(group) < 0) + FAIL_STACK_ERROR /* Create another group with same name */ - H5E_BEGIN_TRY { - group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(group >= 0) { + H5E_BEGIN_TRY { group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } + H5E_END_TRY; + if (group >= 0) { H5Gclose(group); TEST_ERROR } /* end if */ /* Remove the group */ - if(H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create named datatype and duplicate named datatype, remove original & verify file size */ + /* Create named datatype and duplicate named datatype, remove original & verify file size */ TESTING(" duplicate named datatype"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create datatype to commit */ - if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + FAIL_STACK_ERROR /* Create a single named datatype to remove */ - if(H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Tclose(type) < 0) FAIL_STACK_ERROR + if (H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Tclose(type) < 0) + FAIL_STACK_ERROR /* Create datatype to commit */ - if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + FAIL_STACK_ERROR /* Create another named datatype with same name */ - H5E_BEGIN_TRY { - status = H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(status >= 0) TEST_ERROR - if(H5Tclose(type) < 0) FAIL_STACK_ERROR + H5E_BEGIN_TRY { status = H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); } + H5E_END_TRY; + if (status >= 0) + TEST_ERROR + if (H5Tclose(type) < 0) + FAIL_STACK_ERROR /* Remove the named datatype */ - if(H5Ldelete(file, TYPENAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, TYPENAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Create named datatype and duplicate named datatype, remove original & verify file size */ + /* Create named datatype and duplicate named datatype, remove original & verify file size */ TESTING(" duplicate attribute"); /* Create file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create datasets to remove */ - if((dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, contig_dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((dataset = + H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, contig_dcpl, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create a dataspace for the attributes */ - if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) FAIL_STACK_ERROR + if ((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) + FAIL_STACK_ERROR /* Create an attribute on the dataset */ - if((attr = H5Acreate2(dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((attr = H5Acreate2(dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Don't worry about writing the attribute - it will have a fill value */ /* Close the attribute on the dataset */ - if(H5Aclose(attr) < 0) FAIL_STACK_ERROR + if (H5Aclose(attr) < 0) + FAIL_STACK_ERROR /* Create another attribute with same name */ - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { attr = H5Acreate2(dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT); - } H5E_END_TRY; - if(attr >= 0) { + } + H5E_END_TRY; + if (attr >= 0) { H5Aclose(attr); TEST_ERROR } /* end if */ /* Close the dataspace for the attributes */ - if(H5Sclose(attr_space) < 0) FAIL_STACK_ERROR + if (H5Sclose(attr_space) < 0) + FAIL_STACK_ERROR /* Close dataset */ - if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR + if (H5Dclose(dataset) < 0) + FAIL_STACK_ERROR /* Remove the dataset */ - if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close file */ - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != empty_size) TEST_ERROR + if (file_size != empty_size) + TEST_ERROR PASSED(); - -/* Cleanup common objects */ + /* Cleanup common objects */ /* Release dataset buffer */ HDfree(data); /* Close property lists */ - if(H5Pclose(fapl_nocache) < 0) FAIL_STACK_ERROR - if(H5Pclose(contig_dcpl) < 0) FAIL_STACK_ERROR - if(H5Pclose(early_chunk_dcpl) < 0) FAIL_STACK_ERROR - if(H5Pclose(late_chunk_dcpl) < 0) FAIL_STACK_ERROR - if(H5Pclose(comp_dcpl) < 0) FAIL_STACK_ERROR - if(H5Pclose(compact_dcpl) < 0) FAIL_STACK_ERROR + if (H5Pclose(fapl_nocache) < 0) + FAIL_STACK_ERROR + if (H5Pclose(contig_dcpl) < 0) + FAIL_STACK_ERROR + if (H5Pclose(early_chunk_dcpl) < 0) + FAIL_STACK_ERROR + if (H5Pclose(late_chunk_dcpl) < 0) + FAIL_STACK_ERROR + if (H5Pclose(comp_dcpl) < 0) + FAIL_STACK_ERROR + if (H5Pclose(compact_dcpl) < 0) + FAIL_STACK_ERROR /* Close dataspace */ - if(H5Sclose(space) < 0) FAIL_STACK_ERROR + if (H5Sclose(space) < 0) + FAIL_STACK_ERROR /* Indicate success */ /* Don't print final "PASSED", since we aren't on the correct line anymore */ @@ -1227,13 +1449,12 @@ test_filespace(hid_t fapl) error: /* Release dataset buffer */ - if(data) + if (data) HDfree(data); return 1; } /* end test_filespace() */ - /*------------------------------------------------------------------------- * Function: test_create_unlink * @@ -1252,45 +1473,45 @@ error: static int test_create_unlink(const char *msg, hid_t fapl) { - hid_t file, group; + hid_t file, group; unsigned u; - char groupname[1024]; - char filename[1024]; + char groupname[1024]; + char filename[1024]; TESTING(msg); /* Create file */ h5_fixname(FILENAME[3], fapl, filename, sizeof filename); - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_PUTS_ERROR(" Creating file failed") /* Create a many groups to remove */ - for(u = 0; u < UNLINK_NGROUPS; u++) { - sprintf(groupname, "%s %u", GROUPNAME, u); - if((group = H5Gcreate2(file, groupname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { + for (u = 0; u < UNLINK_NGROUPS; u++) { + HDsprintf(groupname, "%s %u", GROUPNAME, u); + if ((group = H5Gcreate2(file, groupname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - printf("group %s creation failed\n", groupname); + HDprintf("group %s creation failed\n", groupname); goto error; } /* end if */ - if(H5Gclose (group) < 0) { + if (H5Gclose(group) < 0) { H5_FAILED(); - printf("closing group %s failed\n", groupname); + HDprintf("closing group %s failed\n", groupname); goto error; } /* end if */ - } /* end for */ + } /* end for */ /* Remove the all the groups */ - for(u = 0; u < UNLINK_NGROUPS; u++) { - sprintf(groupname, "%s %u", GROUPNAME, u); - if(H5Ldelete(file, groupname, H5P_DEFAULT) < 0) { + for (u = 0; u < UNLINK_NGROUPS; u++) { + HDsprintf(groupname, "%s %u", GROUPNAME, u); + if (H5Ldelete(file, groupname, H5P_DEFAULT) < 0) { H5_FAILED(); - printf("Unlinking group %s failed\n", groupname); + HDprintf("Unlinking group %s failed\n", groupname); goto error; } /* end if */ - } /* end for */ + } /* end for */ /* Close file */ - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) FAIL_PUTS_ERROR("Closing file failed") PASSED(); @@ -1300,7 +1521,6 @@ error: return 1; } /* end test_create_unlink() */ - /*------------------------------------------------------------------------- * Function: test_link_slashes * @@ -1319,9 +1539,9 @@ error: static int test_link_slashes(hid_t fapl) { - hid_t fid; /* File ID */ - hid_t gid, gid2; /* Group ID */ - char filename[1024]; + hid_t fid; /* File ID */ + hid_t gid, gid2; /* Group ID */ + char filename[1024]; TESTING("creating links with multiple slashes"); @@ -1329,37 +1549,51 @@ test_link_slashes(hid_t fapl) h5_fixname(FILENAME[5], fapl, filename, sizeof filename); /* Create a file */ - if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create a group in the root group */ - if((gid = H5Gcreate2(fid, SLASHES_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gcreate2(fid, SLASHES_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create a nested group in the root group */ - if((gid2 = H5Gcreate2(gid, SLASHES_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid2 = H5Gcreate2(gid, SLASHES_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Close the nested group */ - if(H5Gclose(gid2) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid2) < 0) + FAIL_STACK_ERROR /* Create a hard link to the nested group */ - if(H5Lcreate_hard(gid, SLASHES_GROUP_NAME, H5L_SAME_LOC, SLASHES_HARDLINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(gid, SLASHES_GROUP_NAME, H5L_SAME_LOC, SLASHES_HARDLINK_NAME, H5P_DEFAULT, + H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Create a soft link with a relative path to the nested group */ - if(H5Lcreate_soft(SLASHES_GROUP_NAME, gid, SLASHES_SOFTLINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_soft(SLASHES_GROUP_NAME, gid, SLASHES_SOFTLINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Create a soft link with the full path to the nested group */ - if(H5Lcreate_soft("////"SLASHES_GROUP_NAME""SLASHES_GROUP_NAME, gid, SLASHES_SOFTLINK2_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_soft("////" SLASHES_GROUP_NAME "" SLASHES_GROUP_NAME, gid, SLASHES_SOFTLINK2_NAME, + H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Create a soft link to the root group */ - if(H5Lcreate_soft("////", gid, SLASHES_ROOTLINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_soft("////", gid, SLASHES_ROOTLINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close the group */ - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR /* Create a hard link to the existing group */ - if(H5Lcreate_hard(fid, SLASHES_GROUP_NAME, H5L_SAME_LOC, SLASHES_HARDLINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(fid, SLASHES_GROUP_NAME, H5L_SAME_LOC, SLASHES_HARDLINK_NAME, H5P_DEFAULT, + H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close the file */ - if(H5Fclose(fid) < 0) FAIL_STACK_ERROR + if (H5Fclose(fid) < 0) + FAIL_STACK_ERROR PASSED(); return 0; @@ -1368,7 +1602,6 @@ error: return 1; } /* end test_link_slashes() */ - /*------------------------------------------------------------------------- * Function: test_unlink_slashes * @@ -1387,9 +1620,9 @@ error: static int test_unlink_slashes(hid_t fapl) { - hid_t fid; /* File ID */ - hid_t gid; /* Group ID */ - char filename[1024]; + hid_t fid; /* File ID */ + hid_t gid; /* Group ID */ + char filename[1024]; TESTING("deleting links with multiple slashes"); @@ -1397,37 +1630,48 @@ test_unlink_slashes(hid_t fapl) h5_fixname(FILENAME[5], fapl, filename, sizeof filename); /* Open the file */ - if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Open the top level group */ - if((gid = H5Gopen2(fid, SLASHES_GROUP_NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gopen2(fid, SLASHES_GROUP_NAME, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Delete the root link */ - if(H5Ldelete(gid,SLASHES_ROOTLINK_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(gid, SLASHES_ROOTLINK_NAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Delete the soft link with the full path */ - if(H5Ldelete(gid,SLASHES_SOFTLINK2_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(gid, SLASHES_SOFTLINK2_NAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Delete the soft link with the relative path */ - if(H5Ldelete(gid,SLASHES_SOFTLINK_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(gid, SLASHES_SOFTLINK_NAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Delete the hard link */ - if(H5Ldelete(gid,SLASHES_HARDLINK_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(gid, SLASHES_HARDLINK_NAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Delete the group itself */ - if(H5Ldelete(gid,SLASHES_GROUP_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(gid, SLASHES_GROUP_NAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close the group */ - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR /* Delete the hard link */ - if(H5Ldelete(fid,SLASHES_HARDLINK_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(fid, SLASHES_HARDLINK_NAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Delete the group itself */ - if(H5Ldelete(fid,SLASHES_GROUP_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(fid, SLASHES_GROUP_NAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close the file */ - if(H5Fclose(fid) < 0) TEST_ERROR + if (H5Fclose(fid) < 0) + TEST_ERROR PASSED(); return 0; @@ -1442,30 +1686,34 @@ error: static int delete_node(hid_t pid, hid_t id) { - char name[256]; /* Name of object to close */ + char name[256]; /* Name of object to close */ /* Get the name of the object to delete */ - if(H5Iget_name(id, name, sizeof(name)) < 0) return (-1); + if (H5Iget_name(id, name, sizeof(name)) < 0) + return (-1); /* Close the object */ - if(H5Gclose(id) < 0) return(-1); + if (H5Gclose(id) < 0) + return (-1); /* Unlink the object */ - if(H5Ldelete(pid, name, H5P_DEFAULT) < 0) return(-1); + if (H5Ldelete(pid, name, H5P_DEFAULT) < 0) + return (-1); /* If this object is the right-most child, try opening the previous object */ - if(HDstrcmp(name,"/Zone81") == 0) { + if (HDstrcmp(name, "/Zone81") == 0) { hid_t gid; - if((gid = H5Gopen2(pid, "/Zone80", H5P_DEFAULT)) < 0) return(-1); - if(H5Gclose(gid) < 0) return(-1); + if ((gid = H5Gopen2(pid, "/Zone80", H5P_DEFAULT)) < 0) + return (-1); + if (H5Gclose(gid) < 0) + return (-1); } /* end if */ /* Indicate success */ - return(0); + return (0); } - /*------------------------------------------------------------------------- * Function: test_unlink_rightleaf * @@ -1485,40 +1733,47 @@ delete_node(hid_t pid, hid_t id) static int test_unlink_rightleaf(hid_t fid) { - hid_t rootid = -1, /* Group ID for root group */ - *gids = NULL; /* Array of IDs for groups created */ - int n, /* Local index variable */ - ngroups = 150; /* Number of groups to create */ - char name[256]; /* Name of object to create */ + hid_t rootid = -1, /* Group ID for root group */ + *gids = NULL; /* Array of IDs for groups created */ + int n, /* Local index variable */ + ngroups = 150; /* Number of groups to create */ + char name[256]; /* Name of object to create */ TESTING("deleting right-most child in non-leaf B-tree node"); /* Allocate space for the group IDs */ - if(NULL == (gids = (hid_t *)HDcalloc((size_t)ngroups, sizeof(hid_t)))) TEST_ERROR + if (NULL == (gids = (hid_t *)HDcalloc((size_t)ngroups, sizeof(hid_t)))) + TEST_ERROR - if((rootid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((rootid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create all the groups */ for (n = 0; n < ngroups; n++) { - sprintf(name, "Zone%d", n + 1); - if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + HDsprintf(name, "Zone%d", n + 1); + if ((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR } /* end for */ /* Unlink & re-create each group */ for (n = 0; n < ngroups; n++) { - if(delete_node (rootid, gids[n]) < 0) TEST_ERROR - sprintf(name, "Zone%d", n + 1); - if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (delete_node(rootid, gids[n]) < 0) + TEST_ERROR + HDsprintf(name, "Zone%d", n + 1); + if ((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + TEST_ERROR } /* end for */ /* Close all the groups */ for (n = 0; n < ngroups; n++) { - if(H5Gclose(gids[n]) < 0) TEST_ERROR + if (H5Gclose(gids[n]) < 0) + TEST_ERROR gids[n] = 0; } /* end for */ /* Close root group ID */ - if(H5Gclose(rootid) < 0) TEST_ERROR + if (H5Gclose(rootid) < 0) + TEST_ERROR /* Free memory */ HDfree(gids); @@ -1527,24 +1782,21 @@ test_unlink_rightleaf(hid_t fid) return 0; error: - if(gids) { + if (gids) { /* Close any open groups */ for (n = 0; n < ngroups; n++) - if(gids[n]) { - H5E_BEGIN_TRY { - H5Gclose(gids[n]); - } H5E_END_TRY; + if (gids[n]) { + H5E_BEGIN_TRY { H5Gclose(gids[n]); } + H5E_END_TRY; } /* end if */ HDfree(gids); } /* end if */ - H5E_BEGIN_TRY { - H5Gclose(rootid); - } H5E_END_TRY; + H5E_BEGIN_TRY { H5Gclose(rootid); } + H5E_END_TRY; return 1; } /* end test_unlink_rightleaf() */ - /*------------------------------------------------------------------------- * Function: test_unlink_rightnode * @@ -1564,40 +1816,50 @@ error: static int test_unlink_rightnode(hid_t fid) { - hid_t rootid = -1, /* Group ID for root group */ - *gids = NULL; /* Array of IDs for groups created */ - int n, /* Local index variable */ - ngroups = 150; /* Number of groups to create */ - char name[256]; /* Name of object to create */ + hid_t rootid = -1, /* Group ID for root group */ + *gids = NULL; /* Array of IDs for groups created */ + int n, /* Local index variable */ + ngroups = 150; /* Number of groups to create */ + char name[256]; /* Name of object to create */ TESTING("deleting right-most child in non-leaf B-tree node"); /* Allocate space for the group IDs */ - if(NULL == (gids = (hid_t *)HDcalloc((size_t)ngroups, sizeof(hid_t)))) TEST_ERROR + if (NULL == (gids = (hid_t *)HDcalloc((size_t)ngroups, sizeof(hid_t)))) + TEST_ERROR - if((rootid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((rootid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create all the groups */ for (n = 0; n < ngroups; n++) { - sprintf(name, "ZoneB%d", n + 1); - if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + HDsprintf(name, "ZoneB%d", n + 1); + if ((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close all the groups */ for (n = 0; n < ngroups; n++) { - if(H5Gclose(gids[n]) < 0) FAIL_STACK_ERROR + if (H5Gclose(gids[n]) < 0) + FAIL_STACK_ERROR gids[n] = 0; } /* end for */ /* Unlink specific objects to trigger deletion of right leaf in non-leaf node */ - if(H5Ldelete(fid, "/ZoneB77", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneB78", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneB79", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneB8", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneB80", H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneB77", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneB78", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneB79", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneB8", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneB80", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close root group ID */ - if(H5Gclose(rootid) < 0) FAIL_STACK_ERROR + if (H5Gclose(rootid) < 0) + FAIL_STACK_ERROR /* Free memory */ HDfree(gids); @@ -1606,24 +1868,21 @@ test_unlink_rightnode(hid_t fid) return 0; error: - if(gids) { + if (gids) { /* Close any open groups */ for (n = 0; n < ngroups; n++) - if(gids[n]) { - H5E_BEGIN_TRY { - H5Gclose(gids[n]); - } H5E_END_TRY; + if (gids[n]) { + H5E_BEGIN_TRY { H5Gclose(gids[n]); } + H5E_END_TRY; } /* end if */ HDfree(gids); } /* end if */ - H5E_BEGIN_TRY { - H5Gclose(rootid); - } H5E_END_TRY; + H5E_BEGIN_TRY { H5Gclose(rootid); } + H5E_END_TRY; return 1; } /* end test_unlink_rightnode() */ - /*------------------------------------------------------------------------- * Function: test_unlink_middlenode * @@ -1643,183 +1902,336 @@ error: static int test_unlink_middlenode(hid_t fid) { - hid_t rootid = -1, /* Group ID for root group */ - *gids = NULL; /* Array of IDs for groups created */ - int n, /* Local index variable */ - ngroups = 250; /* Number of groups to create */ - char name[256]; /* Name of object to create */ + hid_t rootid = -1, /* Group ID for root group */ + *gids = NULL; /* Array of IDs for groups created */ + int n, /* Local index variable */ + ngroups = 250; /* Number of groups to create */ + char name[256]; /* Name of object to create */ TESTING("deleting right-most child in non-leaf B-tree node"); /* Allocate space for the group IDs */ - if(NULL == (gids = (hid_t *)HDcalloc((size_t)ngroups, sizeof(hid_t)))) TEST_ERROR + if (NULL == (gids = (hid_t *)HDcalloc((size_t)ngroups, sizeof(hid_t)))) + TEST_ERROR - if((rootid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((rootid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create all the groups */ for (n = 0; n < ngroups; n++) { - sprintf(name, "ZoneC%d", n + 1); - if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + HDsprintf(name, "ZoneC%d", n + 1); + if ((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close all the groups */ for (n = 0; n < ngroups; n++) { - if(H5Gclose(gids[n]) < 0) FAIL_STACK_ERROR + if (H5Gclose(gids[n]) < 0) + FAIL_STACK_ERROR gids[n] = 0; } /* end for */ /* Unlink specific objects to trigger deletion of all leafs in "interior" non-leaf node */ - if(H5Ldelete(fid, "/ZoneC11", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC110", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC111", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC112", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC113", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC114", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC115", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC116", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC117", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC118", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC119", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC12", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC120", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC121", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC122", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC123", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC124", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC125", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC126", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC127", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC128", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC129", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC13", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC130", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC131", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC132", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC133", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC134", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC135", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC136", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC137", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC138", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC139", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC14", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC140", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC141", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC142", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC143", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC144", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC145", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC146", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC147", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC148", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC149", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC15", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC150", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC151", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC152", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC153", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC154", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC155", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC156", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC157", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC158", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC159", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC16", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC160", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC161", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC162", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC163", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC164", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC165", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC166", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC167", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC168", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC169", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC17", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC170", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC171", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC172", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC173", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC174", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC175", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC176", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC177", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC178", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC179", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC18", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC180", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC19", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC2", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC20", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC21", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC22", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC23", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC24", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC25", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC26", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC27", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC28", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC29", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC3", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC30", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC31", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC32", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC33", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC34", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC35", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC36", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC37", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC38", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC39", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC4", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC40", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC41", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC42", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC43", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC44", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC45", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC46", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC47", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC48", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC49", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC5", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC50", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC51", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC52", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC53", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC54", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC55", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC56", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC57", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC58", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC59", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC6", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC60", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC61", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC62", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC63", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC64", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC65", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC66", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC67", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC68", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC69", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC7", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC70", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC71", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC72", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC73", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC74", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC75", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC76", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC77", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC78", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC79", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC8", H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(H5Ldelete(fid, "/ZoneC80", H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC11", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC110", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC111", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC112", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC113", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC114", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC115", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC116", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC117", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC118", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC119", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC12", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC120", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC121", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC122", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC123", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC124", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC125", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC126", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC127", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC128", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC129", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC13", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC130", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC131", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC132", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC133", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC134", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC135", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC136", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC137", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC138", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC139", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC14", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC140", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC141", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC142", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC143", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC144", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC145", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC146", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC147", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC148", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC149", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC15", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC150", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC151", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC152", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC153", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC154", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC155", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC156", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC157", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC158", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC159", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC16", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC160", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC161", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC162", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC163", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC164", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC165", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC166", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC167", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC168", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC169", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC17", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC170", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC171", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC172", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC173", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC174", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC175", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC176", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC177", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC178", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC179", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC18", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC180", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC19", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC2", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC20", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC21", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC22", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC23", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC24", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC25", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC26", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC27", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC28", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC29", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC3", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC30", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC31", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC32", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC33", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC34", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC35", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC36", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC37", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC38", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC39", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC4", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC40", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC41", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC42", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC43", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC44", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC45", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC46", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC47", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC48", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC49", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC5", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC50", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC51", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC52", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC53", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC54", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC55", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC56", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC57", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC58", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC59", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC6", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC60", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC61", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC62", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC63", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC64", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC65", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC66", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC67", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC68", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC69", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC7", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC70", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC71", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC72", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC73", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC74", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC75", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC76", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC77", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC78", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC79", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC8", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (H5Ldelete(fid, "/ZoneC80", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close root group ID */ - if(H5Gclose(rootid) < 0) FAIL_STACK_ERROR + if (H5Gclose(rootid) < 0) + FAIL_STACK_ERROR /* Free memory */ HDfree(gids); @@ -1828,24 +2240,21 @@ test_unlink_middlenode(hid_t fid) return 0; error: - if(gids) { + if (gids) { /* Close any open groups */ for (n = 0; n < ngroups; n++) - if(gids[n]) { - H5E_BEGIN_TRY { - H5Gclose(gids[n]); - } H5E_END_TRY; + if (gids[n]) { + H5E_BEGIN_TRY { H5Gclose(gids[n]); } + H5E_END_TRY; } /* end if */ HDfree(gids); } /* end if */ - H5E_BEGIN_TRY { - H5Gclose(rootid); - } H5E_END_TRY; + H5E_BEGIN_TRY { H5Gclose(rootid); } + H5E_END_TRY; return 1; } /* end test_unlink_middlenode() */ - /*------------------------------------------------------------------------- * Function: test_resurrect_dataset * @@ -1865,8 +2274,8 @@ error: static int test_resurrect_dataset(hid_t fapl) { - hid_t f = -1, s = -1, d = -1; - char filename[1024]; + hid_t f = -1, s = -1, d = -1; + char filename[1024]; TESTING("resurrecting dataset after deletion"); @@ -1874,49 +2283,63 @@ test_resurrect_dataset(hid_t fapl) h5_fixname(FILENAME[6], fapl, filename, sizeof filename); /* Create the file */ - if((f = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((f = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a dataset in the file */ - if((s = H5Screate(H5S_SCALAR)) < 0) FAIL_STACK_ERROR - if((d = H5Dcreate2(f, DATASETNAME, H5T_NATIVE_INT, s, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Sclose(s) < 0) FAIL_STACK_ERROR + if ((s = H5Screate(H5S_SCALAR)) < 0) + FAIL_STACK_ERROR + if ((d = H5Dcreate2(f, DATASETNAME, H5T_NATIVE_INT, s, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Sclose(s) < 0) + FAIL_STACK_ERROR /* Unlink the dataset while it's open (will mark it for deletion when closed) */ - if(H5Ldelete(f, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(f, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Check that dataset name is NULL */ - if(H5Iget_name(d, NULL, (size_t)0) != 0) FAIL_STACK_ERROR + if (H5Iget_name(d, NULL, (size_t)0) != 0) + FAIL_STACK_ERROR /* Re-link the dataset to the group hierarchy (shouldn't get deleted now) */ - if(H5Lcreate_hard(d, ".", f, DATASET2NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(d, ".", f, DATASET2NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close things */ - if(H5Dclose(d) < 0) FAIL_STACK_ERROR - if(H5Fclose(f) < 0) FAIL_STACK_ERROR + if (H5Dclose(d) < 0) + FAIL_STACK_ERROR + if (H5Fclose(f) < 0) + FAIL_STACK_ERROR /* Re-open the file */ - if((f = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR + if ((f = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) + FAIL_STACK_ERROR /* Attempt to open the dataset under the new name */ - if((d = H5Dopen2(f, DATASET2NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((d = H5Dopen2(f, DATASET2NAME, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Close things */ - if(H5Dclose(d) < 0) FAIL_STACK_ERROR - if(H5Fclose(f) < 0) FAIL_STACK_ERROR + if (H5Dclose(d) < 0) + FAIL_STACK_ERROR + if (H5Fclose(f) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Sclose(s); - H5Dclose(d); - H5Fclose(f); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Sclose(s); + H5Dclose(d); + H5Fclose(f); + } + H5E_END_TRY; return 1; } /* end test_resurrect_dataset() */ - /*------------------------------------------------------------------------- * Function: test_resurrect_datatype * @@ -1936,8 +2359,8 @@ error: static int test_resurrect_datatype(hid_t fapl) { - hid_t file = -1, type = -1; - char filename[1024]; + hid_t file = -1, type = -1; + char filename[1024]; TESTING("resurrecting datatype after deletion"); @@ -1945,47 +2368,60 @@ test_resurrect_datatype(hid_t fapl) h5_fixname(FILENAME[7], fapl, filename, sizeof filename); /* Create the file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a named datatype in the file */ - if((type = H5Tcopy (H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR - if(H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0) + FAIL_STACK_ERROR + if (H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Unlink the datatype while it's open (will mark it for deletion when closed) */ - if(H5Ldelete(file, TYPENAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, TYPENAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Check that datatype name is NULL */ - if(H5Iget_name(type, NULL, (size_t)0) != 0) FAIL_STACK_ERROR + if (H5Iget_name(type, NULL, (size_t)0) != 0) + FAIL_STACK_ERROR /* Re-link the datatype to the group hierarchy (shouldn't get deleted now) */ - if(H5Lcreate_hard(type, ".", file, TYPE2NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(type, ".", file, TYPE2NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close things */ - if(H5Tclose(type) < 0) FAIL_STACK_ERROR - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Tclose(type) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Re-open the file */ - if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) + FAIL_STACK_ERROR /* Attempt to open the datatype under the new name */ - if((type = H5Topen2(file,TYPE2NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((type = H5Topen2(file, TYPE2NAME, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Close things */ - if(H5Tclose(type) < 0) FAIL_STACK_ERROR - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Tclose(type) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Tclose(type); - H5Fclose(file); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Tclose(type); + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* end test_resurrect_datatype() */ - /*------------------------------------------------------------------------- * Function: test_resurrect_group * @@ -2005,8 +2441,8 @@ error: static int test_resurrect_group(hid_t fapl) { - hid_t file = -1, group = -1; - char filename[1024]; + hid_t file = -1, group = -1; + char filename[1024]; TESTING("resurrecting group after deletion"); @@ -2014,46 +2450,58 @@ test_resurrect_group(hid_t fapl) h5_fixname(FILENAME[8], fapl, filename, sizeof filename); /* Create the file */ - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create a group in the file */ - if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Unlink the group while it's open (will mark it for deletion when closed) */ - if(H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Check that group's name is NULL */ - if(H5Iget_name(group, NULL, (size_t)0) != 0) FAIL_STACK_ERROR + if (H5Iget_name(group, NULL, (size_t)0) != 0) + FAIL_STACK_ERROR /* Re-link the group into the group hierarchy (shouldn't get deleted now) */ - if(H5Lcreate_hard(group, ".", file, GROUP2NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_hard(group, ".", file, GROUP2NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close things */ - if(H5Gclose(group) < 0) FAIL_STACK_ERROR - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Gclose(group) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR /* Re-open the file */ - if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR + if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) + FAIL_STACK_ERROR /* Attempt to open the datatype under the new name */ - if((group = H5Gopen2(file, GROUP2NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((group = H5Gopen2(file, GROUP2NAME, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Close things */ - if(H5Gclose(group) < 0) FAIL_STACK_ERROR - if(H5Fclose(file) < 0) FAIL_STACK_ERROR + if (H5Gclose(group) < 0) + FAIL_STACK_ERROR + if (H5Fclose(file) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Gclose(group); - H5Fclose(file); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Gclose(group); + H5Fclose(file); + } + H5E_END_TRY; return 1; } /* end test_resurrect_group() */ - /*------------------------------------------------------------------------- * Function: test_unlink_chunked_dataset * @@ -2072,14 +2520,14 @@ error: static int test_unlink_chunked_dataset(hid_t fapl) { - hid_t file_id = -1; - hid_t dset_id = -1; - hid_t space_id = -1; - hid_t dcpl_id = -1; - hsize_t dims[FILESPACE_NDIMS] = {FILESPACE_DIM0, FILESPACE_DIM1, FILESPACE_DIM2}; - hsize_t max_dims[FILESPACE_NDIMS] = {H5S_UNLIMITED, H5S_UNLIMITED, H5S_UNLIMITED}; + hid_t file_id = -1; + hid_t dset_id = -1; + hid_t space_id = -1; + hid_t dcpl_id = -1; + hsize_t dims[FILESPACE_NDIMS] = {FILESPACE_DIM0, FILESPACE_DIM1, FILESPACE_DIM2}; + hsize_t max_dims[FILESPACE_NDIMS] = {H5S_UNLIMITED, H5S_UNLIMITED, H5S_UNLIMITED}; hsize_t chunk_dims[FILESPACE_NDIMS] = {FILESPACE_CHUNK0, FILESPACE_CHUNK1, FILESPACE_CHUNK2}; - char filename[1024]; + char filename[1024]; TESTING("unlinking chunked dataset"); @@ -2087,58 +2535,73 @@ test_unlink_chunked_dataset(hid_t fapl) h5_fixname(FILENAME[9], fapl, filename, sizeof filename); /* Create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create the dataspace */ - if((space_id = H5Screate_simple(FILESPACE_NDIMS, dims, max_dims)) < 0) FAIL_STACK_ERROR + if ((space_id = H5Screate_simple(FILESPACE_NDIMS, dims, max_dims)) < 0) + FAIL_STACK_ERROR /* Create the dataset creation filter */ - if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) FAIL_STACK_ERROR + if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) + FAIL_STACK_ERROR /* Set to chunked storage */ - if(H5Pset_chunk(dcpl_id, FILESPACE_NDIMS, chunk_dims) < 0) FAIL_STACK_ERROR + if (H5Pset_chunk(dcpl_id, FILESPACE_NDIMS, chunk_dims) < 0) + FAIL_STACK_ERROR /* Set to early space allocation */ - if(H5Pset_alloc_time(dcpl_id, H5D_ALLOC_TIME_EARLY) < 0) FAIL_STACK_ERROR + if (H5Pset_alloc_time(dcpl_id, H5D_ALLOC_TIME_EARLY) < 0) + FAIL_STACK_ERROR /* Create the dataset */ - if((dset_id = H5Dcreate2(file_id, DATASETNAME, H5T_NATIVE_INT, space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((dset_id = H5Dcreate2(file_id, DATASETNAME, H5T_NATIVE_INT, space_id, H5P_DEFAULT, dcpl_id, + H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Close the dataspace */ - if(H5Sclose(space_id) < 0) FAIL_STACK_ERROR + if (H5Sclose(space_id) < 0) + FAIL_STACK_ERROR /* Close the dataset creation property list */ - if(H5Pclose(dcpl_id) < 0) FAIL_STACK_ERROR + if (H5Pclose(dcpl_id) < 0) + FAIL_STACK_ERROR /* Close the dataset */ - if(H5Dclose(dset_id) < 0) FAIL_STACK_ERROR + if (H5Dclose(dset_id) < 0) + FAIL_STACK_ERROR /* Close the file */ - if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR + if (H5Fclose(file_id) < 0) + FAIL_STACK_ERROR /* Re-open the file */ - if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR /* Delete the dataset */ - if(H5Ldelete(file_id, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file_id, DATASETNAME, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Close the file */ - if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR + if (H5Fclose(file_id) < 0) + FAIL_STACK_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Pclose(dcpl_id); - H5Sclose(space_id); - H5Dclose(dset_id); - H5Fclose(file_id); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Pclose(dcpl_id); + H5Sclose(space_id); + H5Dclose(dset_id); + H5Fclose(file_id); + } + H5E_END_TRY; return 1; } /* end test_unlink_chunked_dataset() */ - /*------------------------------------------------------------------------- * Function: test_full_group_compact * @@ -2155,15 +2618,15 @@ error: static int test_full_group_compact(hid_t fapl) { - hid_t file_id = -1; - hid_t gid = -1, gid2 = -1; /* Group IDs */ - H5O_info_t oi; /* Stat buffer for object */ - char objname[128]; /* Buffer for name of objects to create */ - char objname2[128]; /* Buffer for name of objects to create */ - char filename[1024]; /* Buffer for filename */ - h5_stat_size_t keep_size; /* Size of the file with objects to keep */ - h5_stat_size_t file_size; /* Size of each file created */ - unsigned u; /* Local index variable */ + hid_t file_id = -1; + hid_t gid = -1, gid2 = -1; /* Group IDs */ + H5O_info_t oi; /* Stat buffer for object */ + char objname[128]; /* Buffer for name of objects to create */ + char objname2[128]; /* Buffer for name of objects to create */ + char filename[1024]; /* Buffer for filename */ + h5_stat_size_t keep_size; /* Size of the file with objects to keep */ + h5_stat_size_t file_size; /* Size of each file created */ + unsigned u; /* Local index variable */ TESTING("unlinking non-empty compact group"); @@ -2171,107 +2634,135 @@ test_full_group_compact(hid_t fapl) h5_fixname(FILENAME[10], fapl, filename, sizeof filename); /* Create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create group to link objects to */ - if((gid = H5Gcreate2(file_id, "/keep", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gcreate2(file_id, "/keep", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create several objects to link to */ - for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { - sprintf(objname, "keep %u\n", u); - if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(gid2) < 0) FAIL_STACK_ERROR + for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) { + HDsprintf(objname, "keep %u\n", u); + if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(gid2) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close group with objects to keep */ - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR /* Close the file */ - if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR + if (H5Fclose(file_id) < 0) + FAIL_STACK_ERROR /* Get the size of the file with only the objects to keep */ - if((keep_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((keep_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Re-open the file */ - if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR /* Create group to delete */ - if((gid = H5Gcreate2(file_id, "/delete", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gcreate2(file_id, "/delete", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create external link (doesn't matter if it dangles) */ - if(H5Lcreate_external("foo.h5", "/dst", gid, "external", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_external("foo.h5", "/dst", gid, "external", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Create soft link (doesn't matter if it dangles) */ - if(H5Lcreate_soft("/foo", gid, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_soft("/foo", gid, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Create hard links to objects in group to keep */ - for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { - sprintf(objname, "/keep/keep %u\n", u); - sprintf(objname2, "keep %u\n", u); - if(H5Lcreate_hard(file_id, objname, gid, objname2, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) { + HDsprintf(objname, "/keep/keep %u\n", u); + HDsprintf(objname2, "keep %u\n", u); + if (H5Lcreate_hard(file_id, objname, gid, objname2, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ /* Create several objects to delete */ - for(u = 0; u < FULL_GROUP_NUM_DELETE_COMPACT; u++) { - sprintf(objname, "delete %u\n", u); - if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(gid2) < 0) FAIL_STACK_ERROR + for (u = 0; u < FULL_GROUP_NUM_DELETE_COMPACT; u++) { + HDsprintf(objname, "delete %u\n", u); + if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(gid2) < 0) + FAIL_STACK_ERROR } /* end for */ /* Check on group's status */ - if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR - if(H5G__has_links_test(gid, NULL) != TRUE) TEST_ERROR - if(H5G__has_stab_test(gid) == TRUE) TEST_ERROR + if (H5G__is_empty_test(gid) == TRUE) + TEST_ERROR + if (H5G__has_links_test(gid, NULL) != TRUE) + TEST_ERROR + if (H5G__has_stab_test(gid) == TRUE) + TEST_ERROR /* Close group with objects to delete */ - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR /* Check reference count on objects to keep */ - for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { - sprintf(objname, "/keep/keep %u\n", u); - if(H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(oi.rc != 2) TEST_ERROR + for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) { + HDsprintf(objname, "/keep/keep %u\n", u); + if (H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (oi.rc != 2) + TEST_ERROR } /* end for */ /* Close the file */ - if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR - + if (H5Fclose(file_id) < 0) + FAIL_STACK_ERROR /* Re-open the file */ - if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR /* Delete the full group */ - if(H5Ldelete(file_id, "/delete", H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file_id, "/delete", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Check reference count on objects to keep */ - for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { - sprintf(objname, "/keep/keep %u\n", u); - if(H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(oi.rc != 1) TEST_ERROR + for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) { + HDsprintf(objname, "/keep/keep %u\n", u); + if (H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (oi.rc != 1) + TEST_ERROR } /* end for */ /* Close the file */ - if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR + if (H5Fclose(file_id) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != keep_size) TEST_ERROR + if (file_size != keep_size) + TEST_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Gclose(gid2); - H5Gclose(gid); - H5Fclose(file_id); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Gclose(gid2); + H5Gclose(gid); + H5Fclose(file_id); + } + H5E_END_TRY; return 1; } /* end test_full_group_compact() */ - /*------------------------------------------------------------------------- * Function: test_full_group_dense * @@ -2288,16 +2779,16 @@ error: static int test_full_group_dense(hid_t fapl) { - hid_t file_id = -1; - hid_t gcpl = (-1); /* Group creation property list ID */ - hid_t gid = -1, gid2 = -1; /* Group IDs */ - H5O_info_t oi; /* Stat buffer for object */ - char objname[128]; /* Buffer for name of objects to create */ - char objname2[128]; /* Buffer for name of objects to create */ - char filename[1024]; /* Buffer for filename */ - h5_stat_size_t keep_size; /* Size of the file with objects to keep */ - h5_stat_size_t file_size; /* Size of each file created */ - unsigned u; /* Local index variable */ + hid_t file_id = -1; + hid_t gcpl = (-1); /* Group creation property list ID */ + hid_t gid = -1, gid2 = -1; /* Group IDs */ + H5O_info_t oi; /* Stat buffer for object */ + char objname[128]; /* Buffer for name of objects to create */ + char objname2[128]; /* Buffer for name of objects to create */ + char filename[1024]; /* Buffer for filename */ + h5_stat_size_t keep_size; /* Size of the file with objects to keep */ + h5_stat_size_t file_size; /* Size of each file created */ + unsigned u; /* Local index variable */ TESTING("unlinking non-empty dense group"); @@ -2305,33 +2796,43 @@ test_full_group_dense(hid_t fapl) h5_fixname(FILENAME[10], fapl, filename, sizeof filename); /* Create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) + FAIL_STACK_ERROR /* Create group to link objects to */ - if((gid = H5Gcreate2(file_id, "/keep", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gcreate2(file_id, "/keep", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create several objects to link to */ - for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { - sprintf(objname, "keep %u\n", u); - if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(gid2) < 0) FAIL_STACK_ERROR + for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) { + HDsprintf(objname, "keep %u\n", u); + if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(gid2) < 0) + FAIL_STACK_ERROR } /* end for */ /* Close group with objects to keep */ - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR /* Close the file */ - if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR + if (H5Fclose(file_id) < 0) + FAIL_STACK_ERROR /* Get the size of the file with only the objects to keep */ - if((keep_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((keep_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Re-open the file */ - if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR /* Set group creation "est. link info" closer to what will actually occur */ - if((gcpl = H5Pcreate(H5P_GROUP_CREATE)) < 0) FAIL_STACK_ERROR - if(H5Pset_est_link_info(gcpl, FULL_GROUP_EST_NUM_ENTRIES, FULL_GROUP_EST_ENTRY_LEN) < 0) FAIL_STACK_ERROR + if ((gcpl = H5Pcreate(H5P_GROUP_CREATE)) < 0) + FAIL_STACK_ERROR + if (H5Pset_est_link_info(gcpl, FULL_GROUP_EST_NUM_ENTRIES, FULL_GROUP_EST_ENTRY_LEN) < 0) + FAIL_STACK_ERROR /* Create group to delete */ /* (use non-default GCPL, in order to make certain that the group's object @@ -2339,96 +2840,117 @@ test_full_group_dense(hid_t fapl) * another object header message chunk - in order to make the file size * computation below easier/correct - QAK) */ - if((gid = H5Gcreate2(file_id, "/delete", H5P_DEFAULT, gcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if ((gid = H5Gcreate2(file_id, "/delete", H5P_DEFAULT, gcpl, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Close GCPL */ - if(H5Pclose(gcpl) < 0) FAIL_STACK_ERROR + if (H5Pclose(gcpl) < 0) + FAIL_STACK_ERROR /* Create external link (doesn't matter if it dangles) */ - if(H5Lcreate_external("foo.h5", "/dst", gid, "external", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_external("foo.h5", "/dst", gid, "external", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Create soft link (doesn't matter if it dangles) */ - if(H5Lcreate_soft("/foo", gid, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Lcreate_soft("/foo", gid, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Create hard links to objects in group to keep */ - for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { - sprintf(objname, "/keep/keep %u\n", u); - sprintf(objname2, "keep %u\n", u); - if(H5Lcreate_hard(file_id, objname, gid, objname2, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR + for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) { + HDsprintf(objname, "/keep/keep %u\n", u); + HDsprintf(objname2, "keep %u\n", u); + if (H5Lcreate_hard(file_id, objname, gid, objname2, H5P_DEFAULT, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR } /* end for */ /* Create several objects to delete */ - for(u = 0; u < FULL_GROUP_NUM_DELETE_DENSE; u++) { - sprintf(objname, "delete %u\n", u); - if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if(H5Gclose(gid2) < 0) FAIL_STACK_ERROR + for (u = 0; u < FULL_GROUP_NUM_DELETE_DENSE; u++) { + HDsprintf(objname, "delete %u\n", u); + if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + if (H5Gclose(gid2) < 0) + FAIL_STACK_ERROR } /* end for */ /* Check on group's status */ - if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR - if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR - if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR + if (H5G__is_empty_test(gid) == TRUE) + TEST_ERROR + if (H5G__has_links_test(gid, NULL) == TRUE) + TEST_ERROR + if (H5G__is_new_dense_test(gid) != TRUE) + TEST_ERROR /* Close group with objects to delete */ - if(H5Gclose(gid) < 0) FAIL_STACK_ERROR + if (H5Gclose(gid) < 0) + FAIL_STACK_ERROR /* Check reference count on objects to keep */ - for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { - sprintf(objname, "/keep/keep %u\n", u); - if(H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(oi.rc != 2) TEST_ERROR + for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) { + HDsprintf(objname, "/keep/keep %u\n", u); + if (H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (oi.rc != 2) + TEST_ERROR } /* end for */ /* Close the file */ - if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR - + if (H5Fclose(file_id) < 0) + FAIL_STACK_ERROR /* Re-open the file */ - if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if ((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) + FAIL_STACK_ERROR /* Delete the full group */ - if(H5Ldelete(file_id, "/delete", H5P_DEFAULT) < 0) FAIL_STACK_ERROR + if (H5Ldelete(file_id, "/delete", H5P_DEFAULT) < 0) + FAIL_STACK_ERROR /* Check reference count on objects to keep */ - for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) { - sprintf(objname, "/keep/keep %u\n", u); - if(H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) FAIL_STACK_ERROR - if(oi.rc != 1) TEST_ERROR + for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) { + HDsprintf(objname, "/keep/keep %u\n", u); + if (H5Oget_info_by_name(file_id, objname, &oi, H5P_DEFAULT) < 0) + FAIL_STACK_ERROR + if (oi.rc != 1) + TEST_ERROR } /* end for */ /* Close the file */ - if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR + if (H5Fclose(file_id) < 0) + FAIL_STACK_ERROR /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) TEST_ERROR + if ((file_size = h5_get_file_size(filename, fapl)) < 0) + TEST_ERROR /* Verify the file is correct size */ - if(file_size != keep_size) TEST_ERROR + if (file_size != keep_size) + TEST_ERROR PASSED(); return 0; error: - H5E_BEGIN_TRY { - H5Gclose(gid2); - H5Gclose(gid); - H5Pclose(gcpl); - H5Fclose(file_id); - } H5E_END_TRY; + H5E_BEGIN_TRY + { + H5Gclose(gid2); + H5Gclose(gid); + H5Pclose(gcpl); + H5Fclose(file_id); + } + H5E_END_TRY; return 1; } /* end test_full_group_dense() */ - /*------------------------------------------------------------------------- - * Function: main + * Function: main * - * Purpose: Test unlinking operations + * Purpose: Test unlinking operations * - * Return: Success: zero + * Return: Success: zero * - * Failure: non-zero + * Failure: non-zero * - * Programmer: Robb Matzke + * Programmer: Robb Matzke * Friday, September 25, 1998 * * Modifications: @@ -2438,13 +2960,13 @@ error: int main(void) { - hid_t fapl, fapl2, file; - int nerrors = 0; - char filename[1024]; - hbool_t new_format; + hid_t fapl, fapl2, file; + int nerrors = 0; + char filename[1024]; + unsigned new_format; /* Metadata cache parameters */ - int mdc_nelmts; + int mdc_nelmts; size_t rdcc_nelmts; size_t rdcc_nbytes; double rdcc_w0; @@ -2457,27 +2979,30 @@ main(void) fapl = h5_fileaccess(); /* Copy the file access property list */ - if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR + if ((fapl2 = H5Pcopy(fapl)) < 0) + TEST_ERROR /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR + if (H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) + TEST_ERROR /* Test with old & new format groups */ - for(new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = FALSE; new_format <= TRUE; new_format++) { hid_t my_fapl; /* Set the FAPL for the type of format */ - if(new_format) { - puts("\nTesting with new group format:"); + if (new_format) { + HDputs("\nTesting with new group format:"); my_fapl = fapl2; } /* end if */ else { - puts("Testing with old group format:"); + HDputs("Testing with old group format:"); my_fapl = fapl; } /* end else */ h5_fixname(FILENAME[0], my_fapl, filename, sizeof filename); - if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0) TEST_ERROR + if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0) + TEST_ERROR /* Tests */ nerrors += test_one(file); @@ -2496,22 +3021,24 @@ main(void) hid_t fapl_small_mdc; /* Make copy of regular fapl, to turn down the elements in the metadata cache */ - if((fapl_small_mdc = H5Pcopy(my_fapl)) < 0) + if ((fapl_small_mdc = H5Pcopy(my_fapl)) < 0) goto error; /* Get FAPL cache settings */ - if(H5Pget_cache(fapl_small_mdc, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0) < 0) - printf("H5Pget_cache failed\n"); + if (H5Pget_cache(fapl_small_mdc, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0) < 0) + HDprintf("H5Pget_cache failed\n"); /* Change FAPL cache settings */ - mdc_nelmts=1; - if(H5Pset_cache(fapl_small_mdc, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0) < 0) - printf("H5Pset_cache failed\n"); + mdc_nelmts = 1; + if (H5Pset_cache(fapl_small_mdc, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0) < 0) + HDprintf("H5Pset_cache failed\n"); /* Test creating & unlinking lots of objects with a 1-element metadata cache FAPL */ - nerrors += test_create_unlink("create and unlink large number of objects with small cache", fapl_small_mdc); + nerrors += test_create_unlink("create and unlink large number of objects with small cache", + fapl_small_mdc); - if(H5Pclose(fapl_small_mdc) < 0) TEST_ERROR + if (H5Pclose(fapl_small_mdc) < 0) + TEST_ERROR } /* end block */ nerrors += test_link_slashes(my_fapl); @@ -2519,7 +3046,7 @@ main(void) /* Test specific B-tree removal issues */ /* (only for old format groups) */ - if(!new_format) { + if (!new_format) { nerrors += test_unlink_rightleaf(file); nerrors += test_unlink_rightnode(file); nerrors += test_unlink_middlenode(file); @@ -2535,13 +3062,14 @@ main(void) /* Test unlinked groups which still have objects in them */ /* (only for new format groups) */ - if(new_format) { + if (new_format) { nerrors += test_full_group_compact(my_fapl); nerrors += test_full_group_dense(my_fapl); } /* end if */ /* Close */ - if(H5Fclose(file) < 0) TEST_ERROR + if (H5Fclose(file) < 0) + TEST_ERROR } /* end for */ /* Close 2nd FAPL */ @@ -2551,11 +3079,11 @@ main(void) nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); if (nerrors) { - printf("***** %d FAILURE%s! *****\n", nerrors, 1==nerrors?"":"S"); - exit(1); + HDprintf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } - puts("All unlink tests passed."); + HDputs("All unlink tests passed."); h5_cleanup(FILENAME, fapl); @@ -2564,4 +3092,3 @@ main(void) error: return 1; } - |