diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2023-10-12 16:32:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-12 16:32:23 (GMT) |
| commit | ea3f92605761e1ff17d858df303dc375df7efc1c (patch) | |
| tree | 716311100f8d0f0dc77bca31245878546952aabc /test/dtypes.c | |
| parent | 0feda66ff0dccdf77453b7c881c80be244e0ae12 (diff) | |
| download | hdf5-ea3f92605761e1ff17d858df303dc375df7efc1c.zip hdf5-ea3f92605761e1ff17d858df303dc375df7efc1c.tar.gz hdf5-ea3f92605761e1ff17d858df303dc375df7efc1c.tar.bz2 | |
1.14 sync with develop (#3660)
* Rework tools.cmake and add C flags (#3110)
* Fix gh pages so that the doxygen files are uploaded (#3102)
* Add workspace path
* add debug
* Make one job so workspace files are available
* Put doxygen docs under docs folder in gh-pages
* Fix a misc warning in test/vol.c (#3112)
The compiler complains about using integers instead of size_t
for some sizes.
* Remove H5detect and H5make_libsettings (#3104)
Removes H5detect and H5make_libsettings from the build and replaces
their functionality with things that don't affect cross-compiling.
H5detect --> floating-point types are now detected on library load
H5make_libsettings --> Moved functionality to a new H5build_settings.c template file
* clang-tidy clang-analyzer-core issues addressed (#3113)
src/H5system.c:1293:13: warning: Dereference of null pointer
[clang-analyzer-core.NullDereference]
src/H5trace.c:4048:17: warning: Passed-by-value struct argument contains
uninitialized data (e.g., via the field chain: 'initial.user')
[clang-analyzer-core.CallAndMessage]
* Add note for issue 3056 (#3117)
* Use 1.14 toolchain (#3116)
* Remove the checkposix script (#3122)
This script was used to ensure that all non-HDF5 calls were prefixed
with 'HD'. We are removing this scheme so this script is no longer
needed.
* Remove unused HD macros (#3120)
* Remove unused HD macros
The library prefixes most C and POSIX API calls with 'HD'. We are
going to start removing these so the code looks like normal C.
This PR removes most of the unused HD markup macros.
* Replace ntohl/ntohs
* Adds an optional version arg to bin/format_source (#3119)
* Clean up mirror VFD code in utils dir (#3121)
* Remove dead code
* Replace mybzero with memset
* Replace hbool_t/TRUE/FALSE with bool/true/false
* Fix spelling issues flagged by codespell (#3130)
* Make autogen.sh output message consistent (#3128)
* Add Python for HDF-EOS zoo description (#3129)
* Fix function name in comment in ros3 VFD (#3131)
* Revert long double checks (#3133)
* Revert "Remove long double conversion work-arounds (#3097)"
This reverts commit 1e1dac1dac58fa18f6b7788346d1ba7d3315b0f9.
* Update comments to reflect newer systems
* Add java options to build scripts (#3127)
* Add java options to build scripts
Previously, cmakehdf5 turned on compiling of the java interface
by default due to a value set in cacheinit.cmake.
Now, consistent with how Fortran and CPP interfaces are handled,
the script overwrites this default value to disable the libraries,
fixing #2958.
I also implemented the --enable-java/--disable java options for
cmakehdf5, and -java for buildhdf5.
Allen said these scripts should mention that
compilers are to be specified in environment variables, but missing
compilers causes errors at the CMake level, and
CMake's error messages are already pretty informative (See the one
in #2958 about JAVA_COMPILER).
* Removed .lnt linter files (#3143)
These were last usefully modified in 2004
* Fix path to libhdf5.settings in cmakehdf5 (#3140)
* Many clang -Wextra-semi-stmt fixes (#2537)
* Adds semicolons to function-like macros
* Adds a do..while(0) loop to some macros
* Removes semicolons when inappropriate, especially H5E_TRY_BEGIN/END
* Remove HD prefix from network calls (#3142)
HDsocket(), etc. Only affects the mirror VFD and its test code.
* Remove hbool_t/TRUE/FALSE from java (#3145)
Replaces with bool/true/false
* CMake: (feature) ROS3 and cmake config file. (#3146)
- Added a cmake variable to the hdf5-config.cmake file which
indicate if the library has been build with or without the
read-only S3 functionality.
* Define minimal permissions for new GitHub workflows (#3147)
* Track s3 i/o when S3COMMS_DEBUG enabled (#3139)
* Track s3 i/o when S3COMMS_DEBUG enabled
* Fix the snapshots workflow (#3148)
* Add upload url as artifact
* Change doxygen path and comment log-url upload
* zip doxygen files for upload
* add workspace var
* chore: fix grammar (#3150)
* chore: fix grammar
* Removes the HD prefix from java C99 calls (#3149)
POSIX calls (HDstrndup, etc.) are unchanged
* Correct the zip usage (#3153)
* Many fixes to various compiler warnings (#3124)
* Fixed various -Wmissing-variable-declarations by adding static keyword
* In a few cases, renamed the variable suffix from _g to _s.
* Fixed some -Wmissing-variable-declarations by using different declaration macros
* Fixed various -Wconditional-uninitialized warnings by just initializing variable to zero
* Fixed various -Wcomma warnings
* Fixed clang -Wstrict-prototypes warnings
* Fixed various -Wunused-variable warnings
* Updated some casts to fix the only 3 -Wcast-qual warnings
* Fixed the only -Wsometimes-uninitialized warning
* Create Security Policy (#3152)
* Fix #1978 h5vers usage message. (#3162)
Update Platforms Tested in RELEASE.txt.
* speed-up building HDF5 (#3087)
Disables building the tests when building the netCDF, etc.
* Remove dead code behind #ifdef OLD_WAY (#3163)
* Remove H5F_evict_tagged_metadata() (#3165)
The rest of the library just calls H5AC_evict_tagged_metadata()
directly.
* Add missing space in zip command (#3167)
* Fixed check for a VOL's async compatibility (#3164)
* cap flag fix in test
* added async comp. output
* Update Linux workflows (#3173)
* Consolidate environment setup
* Turn on ros3 VFD in CMake (Linux only)
* Add gh-pages doxygen link (#3175)
* Fix the doxygen to gh pages and artifact creation (#3176)
* Tidy the list of options in main.yml (#3181)
* Remove HD/hbool_t from fortran (#3182)
* Remove HD/hbool_t from high-level lib (#3183)
* Remove HDva_(arg|copy|end|start) (#3184)
* Drop HD prefix & hbool_t from H5TS (#3180)
* Remove HD from fork/exec*/wait* (#3190)
These are not C99 but are hidden behind ifdefs and are highly
unlikely to ever have non-POSIX equivalents.
* Fix assertion failure when attempting to use IOC VFD directly (#3187)
* Rename HDqsort() to qsort() (#3193)
* Rename HDqsort() to qsort()
* Committing clang-format changes
---------
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Rename HDpipe() to pipe() (#3192)
Pipe is POSIX but implemented in Microsoft's CRT
* Rename HDassert() to assert() (#3191)
* Change HDassert to assert
* Fix bin/make_err
* Rename HD(f)printf() to (f)printf() (#3194)
* Add note about HDF5_VOL_CONNECTOR to tools usage (#3159)
* Rename HDsystem() to system() (#3197)
system() is only used in the iopipe test and the things it calls
(which are POSIX-y) are protected by an ifdef.
* Remove HD from HDposix_memalign() (#3196)
The posix_memalign call is only used in the direct VFD, which can only
be built if posix_memalign() is available.
* Remove HD from memory allocate/free calls (#3195)
* HDcalloc
* HDfree
* HDmalloc
* HDrealloc
* chore: fix grammar (#3207)
* docs: remove redundancy in Data Transfer section of user guide (#3208)
* Remove checks for setsysinfo, which is unused (#3205)
* Autotools
* CMake
* Remove HD from protected POSIX calls (#3203)
These calls are non-C99 but protected by ifdefs and have no Windows
equivalents:
* HDalarm
* HDasprintf
* HDclock_gettime
* HDfcntl
* HDgethostname
* HDgetrusage
* HDsymlink
* Rename HDato*() to ato*() (#3201)
* Remove some "Programmer" comments (#3209)
These are meaningless noise.
Removes the "Programmer" lines on comment start lines:
/* Programmer: John Smith
These complicate my sed script that will rip out the rest of
the comments.
* Rename HDexit() and related to exit(), etc. (#3202)
* HDatexit
* HDexit
* HD_exit
* Remove HD from strto* calls (#3204)
* HDstrtod
* HDstrtol
* HDstrtoll
* HDstrtoul
* HDstrtoull
* HDstrtoumax
* Remove HD from C std lib file ops (#3206)
* HDfclose
* HDferror
* HDfeof
* HDfflush
* HDfopen
* HDfread
* HDfwrite
* Remove programmer/date from comments (#3210)
* Removes Programmer: and Date: fields
* Fixes a few Modifications: fields leftover from previous work
* Remove HD from HDmem* calls (#3211)
* Remove HD from HDis* (e.g., isalpha) (#3212)
* HDisalnum
* HDisalpha
* HDiscntrl
* HDisdigit
* HDisgraph
* HDislower
* HDisprint
* HDispunct
* HDisspace
* HDisupper
* HDisxdigit
* Update actions for release option, fix branch for daily build (#3185)
* Update actions for release option, fix branch for daily build
* Scheduled workflows run on latest commit on the develop
* Add snapshots location
* docs: improve consistency in verb form (#3076) (#3188)
* fix gh action if statements (#3213)
* Adjust presets timeout and fix build script VS versions (#3215)
* Several ros3vfd logging improvements
* Committing clang-format changes
* Update COPYING (#3231)
Fixed old support URL.
* addresses compilation fortran warnings on Frontier (#3236)
* Fix doc for H5allocate_memory (#3240)
* merge bbrelease to release (#3232)
* merge bbrelease to release
* Fix pre-req workflow
* Replace support.hdfgroup.org URLs for alternative COPYING file (#3228)
* Replace support.hdfgroup.org URLs for alternative COPYING file
locations in copyright headers with https://www.hdfgroup.org/licenses.
Replace support.hdfgroup.org URL for alternative COPYING_LBNL_HDF5
with github URL.
Tweak chkcopyright script for change from UICOPYRIGHTSTR to
THGCOPYRIGHTSTR.
* Replace 1_10 reference with develop branch (#3227)
* Switch CI to use release script (#3242)
* Subfiling VFD source cleanup (#3241)
* Subfiling VFD source cleanup
Modularize Subfiling CMake code into separate CMakeLists.txt file
Update Mercury util code to latest version and update Copyright
Generate mercury_util_config.h header file instead of using
pre-generated file
Remove unnecessary Mercury functionality
Fix minor warning in Subfiling VFD code
* Remove Mercury headers from Autotools publicly-distributed header list
* install h5fuse.sh in bin dir. (#3244)
* Disable h5py until fixed properly without spack (#3243)
* ROS3: (feature) Temporary security credentials (#3030)
- Implemented support for AWS temporary security credentials.
For this kind of credentials also a session/security token
should be included in the request by adding the
x-amz-security-token header.
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
Co-authored-by: Jordan Henderson <jhenderson@hdfgroup.org>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Avoid truncating at null byte when copying to std::string (#3083)
---------
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Fix CMake builds when Subfiling VFD isn't enabled (#3250)
* Fix CMake builds when Subfiling VFD isn't enabled
* Add Subfiling VFD entry to hdf5-config.cmake.in
* Fix some warnings in developer builds (#3247)
* Fix some warnings in developer builds
* Switch approach to Winline flag
* Fixed more warnings about extra semicolons (#3249)
* Require semi-colon after H5_CHECK_OVERFLOW calls
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Fix warning in H5C__UPDATE_STATS_FOR_DIRTY_PIN macro (#3259)
Add braces to H5C__UPDATE_STATS_FOR_DIRTY_PIN macro to fix warning
causing Werror Release builds to fail
* Update DEFAULT_API_VERSION documentation for CMake (#3255)
* Update DEFAULT_API_VERSION documentation for CMake
* Fix hint
---------
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
* changed the scope of #ifdef DOXYGEN to now include H5D multi-functions (#3254)
* Option changed but not all references (#3252)
* Option changed but not all references
* remove quotes from binary var
* Move 1.12.3 release to October (#3263)
* Fixed some -Wunused-variable warnings and one Wsometimes-uninitialized warning (#3260)
* removed the use of encoded single apostrophe (#3261)
* removed the use of encoded single apostrophe, and fix H5Dread_chunk from write to read
* updated sanitizer paragraph
* fixed brief description for H5Fget_info
* ROS3: (fix) Replaced HDfprintf (#3266)
- Replaced the HDfprintf() functions by fprintf() to be consistent
with other parts of the library.
* chore: make VRFY output consistent (#3268)
* CMake: (fix) Threads dependency (#3267)
- If the HDF5 library has been build with either thread-safety or
subfiling VFD feature on it will have an additional dependency
on a threading library. This dependency has been added to the
hdf-config.cmake.in file.
* chore: fix grammar - get hang -> get hung (#3272)
* Another round of fixing -Wextra-semi-stmt warnings (#3264)
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* chore: fix typo - persent -> present (#3273)
* Remove py-pip from h5py action (#3265)
* Update release schedule (#3317)
* Move 1.12.3 to November
* Add 1.14.3 in October
* Update README.md w/ 1.4.3 info (#3318)
* Switch parallel compression to use vector I/O (#3245)
Updates parallel compression feature to use vector I/O instead of
creating and passing down MPI derived types to VFD
* Fix incorrect error check in H5Ofill.c for undefined fill values (#3312)
* Fix H5Otoken_to_str call in h5dump and other minor cleanup (#3314)
* Fix loading plugin fails with missing directory GH issue #3248 (#3315)
* Made HGOTO_ERROR a do-while loop (#3308)
* Made HGOTO_ERROR a do-while loop
* Update files to skip list and ignore_words_list (#3321)
* Update files to skip list and ignore_words_list for codespell to not
check files generated by autotools. Autotools generate misspellings
that can't be fixed in HDF5 code.
* Windows runtime items go into the bin folder (#3320)
* A couple of documentation items to fix (#3332)
* Fix h5repack for variable-length datatyped datasets (#3331)
* Fix CVE-2018-11202 (#3330)
A malformed file could result in chunk index memory leaks. Under most
conditions (i.e., when the --enable-using-memchecker option is NOT
used), this would result in a small memory leak and and infinite loop
and abort when shutting down the library. The infinite loop would be
due to the "free list" package not being able to clear its resources
so the library couldn't shut down. When the "using a memory checker"
option is used, the free lists are disabled so there is just a memory
leak with no abort on library shutdown.
The chunk index resources are now correctly cleaned up when reading
misparsed files and valgrind confirms no memory leaks.
* Fix CVE-2018-13867 (#3336)
* Fixes the last of the -Wextra-semi-stmt warnings (#3326)
* Fixed extra semi warning by adjusting alternative macro definitions
* Find-replace H5E_END_TRY; -> H5E_END_TRY
* Made H5Epush_goto a do-while loop, fixed indentation
* Made GOTOERROR and ERRMSG do-while loops
* Made Hgoto_error and Hgoto_done do-while loops
* Made vrfy_cint_type and vrfy_ctype do-while loops
* Made TEST_TYPE_CONTIG and others do-while loops
* Removed extraneous semi-colons
* Committing clang-format changes
---------
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Fix a typo in RELEASE.txt
* Fix assertion failure in H5D__mpio_collective_filtered_vec_io (#3340)
* Make h5dump spacing consistent when printing VLEN datatype (#3351)
* Fix for the bug exposed from running test/set_extent.c when selection… (#3319)
* Fix for the bug exposed from running test/set_extent.c when selection I/O is enabled.
This is a fix from Neil.
The test/set_extent.c is modified to test for selection I/O enabled.
* Add Fortran ES module to deploy list (#3341)
* Add Fortran ES module to deploy list
* Change fortran mod file export to use a list of names
* test(parallel): verify FALSE case (#3356)
* Implementation of the mpio driver with selection I/O. (#3222)
* This changes the default selection I/O to on for MPIO.
* Work around a testphdf5 failure on Cray MPICH machines (#3361)
* set H5_PAC_C_MAX_REAL_PRECISION default to 0 when cross sompiling with (#3364)
CMake to fix Fortran build failures.
* Add RELEASE.txt notes for recent selection I/O work. (#3374)
* Fix possible performance regression introduced with in-place type conversion in 1.14.2 (#3376)
* Correct script (#3377)
* Correct CI settings (#3384)
* Correct CI settings
* Correct plugin file name
* restore CI tarball name prefix to match bin/release (#3385)
* Fix assertion failure during file close on error (#3387)
* Fix compile failures with H5C_DO_MEMORY_SANITY_CHECKS enabled (#3388)
* Fix valgrind warning about write of uninitialized bytes (#3389)
* Fix valgrind warning about write of uninitialized bytes in ScaleOffset filter (#3390)
* Update presets, examples uncompress, szip cache (#3391)
* Fix serial to parallel chunked dataset file space allocation bug (#3394)
* chore: fix typo (#3405)
* Fix for CVE-2016-4332 (#3406)
This CVE issue was previously listed as fixed (via HDFFV-9950) back in
2016, but with no confirmation test. Now that test files exist for
the 2016 Talos CVE issues, we found that CVE-2016-4332 can raise an
assert in debug builds.
This fix replaces the assert with pointer checks that don't raise
errors or asserts. Since the function is in cleanup code, we do our
best to close and free things, even when presented with partially-
initialized structs.
Fixes CVE-2016-4332 and HDFFV-9950 (confirmed via the cve_hdf5 repo)
* Fix ph5diff tests for MPIEXEC_MAX_NUMPROCS=1 (#3407)
* Enable szip by default in Autotools (#3412)
Since libaec is so prevalent and BSD-licensed for both encode and
decode, we build the szip filter by default when the szip or aec
libraries are found.
* Re-enable SZIP default to ON in CMake (#3414)
The Autotools were handled in a separate commit
* Fix Heap-buffer-overflow WRITE in H5MM_memcpy (#3368)
* Add Intel oneAPI actions (#2949) (#2977)
* ci: add Intel oneAPI actions (#2949)
* ci: fix CMake installation
* ci: use absolute paths for libtool installation
* ci(oneAPI): update compiler versions and use cron
* Add RELEASE.txt entry for compound performance regression fix (#3376) (#3416)
* chore: remove gubbins comment (#3420)
* Add other types and full type to enum/str/vlen dataformat for structblock[begin/end] (#3353)
* Avoid H5Ocopy in h5repack for variable-length string types (#3419)
* Skip atomicity tests for OpenMPI major versions < 5 (#3421)
* Fix an issue with use of uninitialized memory in trefer_deprec.c test (#3422)
* Add parallel examples in doxygen (#3413)
* Fix use of uninitialized value in testpar/t_dset.c test (#3423)
* Remove extraneous "33" in RELEASE.txt (#3425)
* Revise file close assertion failure fix (#3418)
* Remove intel oneapi warning (#3426)
* Fix for CVE-2018-15671. h5stat -S $POC will result in a crash with segmenetation fault. (#3427)
It is because the object in the testfile points back to the root group.
When the tool tries to traverse the object, it goes back to the root group and then back again.
* chore: match function call and VRFY() output (#3428)
* Fix the Fortran extension used in example links (#3430)
* Put H5T_CONV_ab macros in do..while loops (#3432)
Ever since a recent round of macro cleanup, bin/trace and clang-format
have been bickering over what H5Tconv.c should look like and neither
produces readable code.
This change puts the top-level H5T_CONV_ab macros in do..while loops,
adds appropriate semicolons, and adds the missing H5_CLANG_DIAG_ON|OFF
and H5_GCC_CLANG_DIAG_ON|OFF macros to the list of statement macros
clang-format recognizes. H5Tconv.c is now readable and both bin/trace
and clang-format are happy.
* Convert some H5MM calls to standard C equivalents (#2382)
* H5MM_calloc and malloc are now mapped to stdlib C calls
* H5MM_memcpy now maps directly to memcpy in release builds
* H5MM_memcpy is still implemented as a separate function that
checks for buffer overlap when H5MM_DEBUG is defined
(default w/ debug builds)
* Switches many library memcpy calls to use H5MM_memcpy
* Fixes a possible zero allocation in H5Olayout.c
* Add 1.14.4 to the release schedule (#3434)
* Output stderr file in CMake testing on failure (#3431)
* Add Intel oneAPI badges (#3433)
* Add a CVE regression test action (#3445)
*
* Disable SZIP for Intel oneAPI Action (#3449)
* Disable SZIP for Intel oneAPI Action
* Disable Fortran and parallel
* Update VOL CMake for REST VOL (#3450)
* Update VOL CMake for REST VOL
* Prevent linking static libs to VOLs
* Add an h5py badge to README.md (#3477)
* Removed all the ranks printing out testing information (#3457)
* Fix Subfiling VFD IOC assignment bug (#3456)
* Correct java test dimension (#3482)
* Support CMake VOL builds with FetchContent from local directory (#3455)
* Update VOL CMake for REST VOL
* Prevent linking static libs to VOLs
* index on fetch_local: 5c5c3f1505 Prevent linking static libs to VOLs
* index on (no branch): 9a36d3e7b1 On fetch_local: WIP:add source dir fetch option for vols
* Allow building of VOL from local source
* Move LOCAL_DIR option to HDF5_VOL_ALLOW_EXTERNAL
* Fix the Fortran include dir in install config files (#3454)
* Convert hbool_t --> bool in examples (#3492)
* Fix some minor formatting for consistency (#3499)
* Create scorecard.yml (#3508)
Bring in OSSF Scorecard code scanner as a GitHub action
* Convert hbool_t --> bool in testpar (#3495)
* hbool_t/TRUE/FALSE --> bool/true/false in tools (#3491)
* Convert hbool_t --> bool in test (#3494)
* Convert hbool_t --> bool in src (#3496)
* hbool_t --> bool in src
* Does not remove TRUE/FALSE
* Public header files are unchanged
* Public API calls are unchanged
* TRUE/FALSE --> true/false in src
* Add deprecation notice for hbool_t
* Added new Fortran API wrappers (#3511)
* Added new wrappers for
h5get_free_list_sizes_f
H5Sselect_intersect_block_f
H5Sselect_shape_same_f
h5pget_no_selection_io_cause_f
h5pget_mpio_no_collective_cause_f
H5Lvisit_by_name_f
H5Lvisit_f
H5Fget_info_f
h5dwrite_chunk_f
h5dread_chunk_f
* added h5pget_file_space_page_size_f, h5pset_file_space_page_size_f, h5pget_file_space_strategy_f, h5pset_file_space_strategy_f, h5info tests
* added fortran tests
* Update tH5F.F90
* misc. fortran fixes for failing CI dailty tests (#3523)
* fixed H5Lvisit* interface
* changed integer type for direct write
* Consistent initialization of hid_t in the tests (#3521)
* Fix windows cpack with debug (#3525)
* Add missing row for the ROS3 VFD in table #3415 (#3517)
* fixed nvidia compiler issue (#3527)
* Identify functions in a subgroup (#3530)
* quiet warning on sunspot (gcc 11.2.0) (#3534)
* Add API examples doxygen page (#3500)
* removed C_INT32_T from Fortran APIs (#3537)
* Add NVHPC 23.7 GitHub Actions (#3509)
* Add NVHPC 27.3 GitHub Actions
* Address @derobins review
* Remove HD prefix from math functions (#3538)
* Remove HD prefix from HDlog10 calls (#3539)
Was missed in a previous commit and causes building subfiling to
fail.
* fixed arg to C H5Dwrite_chunk (#3541)
* Strip HD prefix from string/char C API calls (#3540)
* Strip HD prefix from string/char C API calls
* HD(f)(put|get)(s|c)
* HDstr*
* HDv*printf
* HD(s)(print|scan)f
* HDperror
But NOT:
* HDstrcase*
* HDvasprintf
* HDstrtok_r
* HDstrndup
As those are not C99 and have portability work-around
implementations. They will be handled later.
* Fix th5_system.c screwup
* Convert main.yml CI into callable workflows (#3529)
* Fix broken URL. (#3546)
* Fix grammar (#3545)
* Update oneAPI-C/A badge yml links. (#3564)
* Check return values from HDF5 API calls. (#3556)
* Adds link to h5fuse.sh in testpar for autotools (#3557)
* Make the h5fuse.sh utility available to parallel subfiling tests so h5fuse testing is not skipped.
* Some minor formatting and text changes (#3563)
* Fix typos and grammar in t_pread. (#3565)
* Fix typo (givin->given) in test/testframe.c. (#3567)
* Fix ifx unused variable hdferr warning. (#3568)
* Correct comments about H5Z_FILTER_NONE (#3572)
* Update release script. (#3577)
* fixed function declaration (#3579)
* Fixed GH-3554 (#3584)
Removed the extra condition
* Remove h5dwalk.1 man page. (#3589)
* Removed the use of -commons linking option on Darwin (#3581)
Removed the use of -commons linking option on Darwin as COMMON and EQUIVALENCE is no long used
* Fix docs for H5Pset_dxpl_mpio_collective_opt() (#3594)
* Fix typo: arange->arrange in src/H5Cmpio.c. (#3597)
* Fix docs for H5Acreate2 and H5Acreate_by_name (#3598)
* Use HDoff_t with lseek consistently (#3600)
lseek on Windows uses __int64 for both the offset and return type
instead of off_t like most POSIX systems. This changes ensures we
use HDoff_t (which is typdef'd correctly on Windows) w/ lseek.
* Replaces HDgetenv with getenv (#3599)
* Develop tools move (#3580)
Reorganizes the tools files to support the VOL tests
* Clean up Subfiling VFD header doxygen formatting (#3601)
* Remove `sh` to run bash script. (#3590)
* Correct path name of ddl file to be changed (#3607)
* Fix potential uninitialized variable (#3602)
Moves a union initialization up a bit so it's performed before code
that can jump to the cleanup target, where file descriptors could
be checked without being initialized.
This could only happen in test code and only in an out-of-memory
situation.
Fixes Coverity 1542254
* Remove unnecessary assignment in test generator (#3603)
Fixes what looks like a copy/paste/modify error in the format convert
test file generator, where an array element is assigned one value
and them immediately overwritten by another value.
Fixes Coverity issue 1542285
* Remove useless define TRUE/FALSE statements. (#3604)
* Fix typo behaviour and dependes. (#3605)
* Fix typos (#3609)
* Fixed unused variable in H5CS.c (#3552) (#3612)
* Fixed #3552
* Fix grammar (#3614)
* Cleanup unused statements (#3553) (#3617)
Removed unnecessary assert statements and noise comments.
* Fix Intel oneAPI icc warning (#3619)
* Fix several spelling/grammar issues (#3621)
* Add HPC CDash to README.md (#3623)
* Disable static + thread-safe on Windows w/ CMake (#3622)
The thread-safety feature on Windows requires a hook in DllMain() and
thus is only available when HDF5 is built as a shared library.
This was previously a warning, but has now been elevated to a fatal
error that cannot be overridden with ALLOW_UNSUPPORTED.
Fixes GitHub #3613
* Remove unused member from H5D_shared_t struct. (#3628)
* Remove old EXTERNALPROJECT_ADD in favor of FETCH_CONTENT (#3624)
* Fix grammar (#3635)
* Disambiguate error output messages. (#3634)
* Disambiguate error output messages.
* Address @brtnfld review.
* Fail CMake on Windows when sub-filing VFD is enabled (#3636)
* Improve consistency in past tense usage (#3638)
* Split out test logic to separate file (#3639)
* Drop MPI-2 support (#3643)
* Switch IEEE flags for NAG Fortran (#3644)
Default is -ieee=stop, which causes problems when the H5T
module performs floating-point type introspection.
The new mode is -ieee=full
* Remove 1.10.11 info from README.md (#3646)
* Fixes GH#1027 compilation error (#3654)
* Remove 1.10 badge (#3650)
* Use real URLs and updated names for plugins (#3651)
* synchronize TGZ naming convention/usage
* Update parallel compression feature to support multi-dataset I/O (#3591)
* Add more tests for selection I/O. (#3528)
* Adjust 1.14 files after merging
---------
Diffstat (limited to 'test/dtypes.c')
| -rw-r--r-- | test/dtypes.c | 390 |
1 files changed, 197 insertions, 193 deletions
diff --git a/test/dtypes.c b/test/dtypes.c index 21a79a1..74b6f61 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -309,7 +309,7 @@ test_copy(void) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Should not be able to close a predefined type!"); + puts(" Should not be able to close a predefined type!"); goto error; } @@ -364,15 +364,15 @@ test_detect(void) * Test class of some atomic types. *------------------------------------------------------------------------------*/ /* Native integers should be in the integer class */ - if (H5Tdetect_class(H5T_NATIVE_INT, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_INTEGER) != true) TEST_ERROR; /* Native integers should _not_ be in other classes */ - if (H5Tdetect_class(H5T_NATIVE_INT, H5T_FLOAT) != FALSE) + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_FLOAT) != false) TEST_ERROR; - if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ARRAY) != FALSE) + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ARRAY) != false) TEST_ERROR; - if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ENUM) != FALSE) + if (H5Tdetect_class(H5T_NATIVE_INT, H5T_ENUM) != false) TEST_ERROR; /*-------------------------------------------------------------------------------- @@ -393,15 +393,15 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_cmpd_id, H5T_COMPOUND) != TRUE) + if (H5Tdetect_class(atom_cmpd_id, H5T_COMPOUND) != true) TEST_ERROR; - if (H5Tdetect_class(atom_cmpd_id, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(atom_cmpd_id, H5T_INTEGER) != true) TEST_ERROR; - if (H5Tdetect_class(atom_cmpd_id, H5T_FLOAT) != TRUE) + if (H5Tdetect_class(atom_cmpd_id, H5T_FLOAT) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_cmpd_id, H5T_VLEN) != FALSE) + if (H5Tdetect_class(atom_cmpd_id, H5T_VLEN) != false) TEST_ERROR; /*-------------------------------------------------------------------------------- @@ -412,17 +412,17 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_arr_id, H5T_ARRAY) != TRUE) + if (H5Tdetect_class(atom_arr_id, H5T_ARRAY) != true) TEST_ERROR; - if (H5Tdetect_class(atom_arr_id, H5T_REFERENCE) != TRUE) + if (H5Tdetect_class(atom_arr_id, H5T_REFERENCE) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_arr_id, H5T_VLEN) != FALSE) + if (H5Tdetect_class(atom_arr_id, H5T_VLEN) != false) TEST_ERROR; - if (H5Tdetect_class(atom_arr_id, H5T_FLOAT) != FALSE) + if (H5Tdetect_class(atom_arr_id, H5T_FLOAT) != false) TEST_ERROR; - if (H5Tdetect_class(atom_arr_id, H5T_INTEGER) != FALSE) + if (H5Tdetect_class(atom_arr_id, H5T_INTEGER) != false) TEST_ERROR; /* Create a VL datatype with an atomic base type of float*/ @@ -430,15 +430,15 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_vlf_id, H5T_VLEN) != TRUE) + if (H5Tdetect_class(atom_vlf_id, H5T_VLEN) != true) TEST_ERROR; - if (H5Tdetect_class(atom_vlf_id, H5T_FLOAT) != TRUE) + if (H5Tdetect_class(atom_vlf_id, H5T_FLOAT) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_vlf_id, H5T_COMPOUND) != FALSE) + if (H5Tdetect_class(atom_vlf_id, H5T_COMPOUND) != false) TEST_ERROR; - if (H5Tdetect_class(atom_vlf_id, H5T_INTEGER) != FALSE) + if (H5Tdetect_class(atom_vlf_id, H5T_INTEGER) != false) TEST_ERROR; /* Create a VL datatype with an atomic base type of char. It should be a VL @@ -447,13 +447,13 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_vlc_id, H5T_VLEN) != TRUE) + if (H5Tdetect_class(atom_vlc_id, H5T_VLEN) != true) TEST_ERROR; - if (H5Tdetect_class(atom_vlc_id, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(atom_vlc_id, H5T_INTEGER) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_vlc_id, H5T_STRING) != FALSE) + if (H5Tdetect_class(atom_vlc_id, H5T_STRING) != false) TEST_ERROR; /* Create a VL string. It should be a string, not a VL class. */ @@ -463,11 +463,11 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(atom_vls_id, H5T_STRING) != TRUE) + if (H5Tdetect_class(atom_vls_id, H5T_STRING) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(atom_vls_id, H5T_VLEN) != FALSE) + if (H5Tdetect_class(atom_vls_id, H5T_VLEN) != false) TEST_ERROR; /*-------------------------------------------------------------------------------- @@ -490,25 +490,25 @@ test_detect(void) TEST_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(cplx_cmpd_id, H5T_COMPOUND) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_COMPOUND) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_ARRAY) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_ARRAY) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_REFERENCE) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_REFERENCE) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_INTEGER) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_FLOAT) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_FLOAT) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_STRING) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_STRING) != true) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_VLEN) != TRUE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_VLEN) != true) TEST_ERROR; /* Make certain that an incorrect class is not detected */ - if (H5Tdetect_class(cplx_cmpd_id, H5T_TIME) != FALSE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_TIME) != false) TEST_ERROR; - if (H5Tdetect_class(cplx_cmpd_id, H5T_ENUM) != FALSE) + if (H5Tdetect_class(cplx_cmpd_id, H5T_ENUM) != false) TEST_ERROR; /* Close complex compound datatype */ @@ -750,7 +750,7 @@ test_compound_2(void) const size_t nelmts = NTESTELEM; const hsize_t four = 4; unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; - hid_t st = -1, dt = -1; + hid_t st = H5I_INVALID_HID, dt = H5I_INVALID_HID; hid_t array_dt; int64_t nmembs; int i; @@ -875,7 +875,7 @@ test_compound_3(void) const size_t nelmts = NTESTELEM; const hsize_t four = 4; unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; - hid_t st = -1, dt = -1; + hid_t st = H5I_INVALID_HID, dt = H5I_INVALID_HID; hid_t array_dt; int64_t nmembs; int i; @@ -1000,7 +1000,7 @@ test_compound_4(void) const size_t nelmts = NTESTELEM; const hsize_t four = 4; unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; - hid_t st = -1, dt = -1; + hid_t st = H5I_INVALID_HID, dt = H5I_INVALID_HID; hid_t array_dt; int64_t nmembs; int i; @@ -1225,7 +1225,7 @@ test_compound_6(void) const size_t nelmts = NTESTELEM; unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; - hid_t st = -1, dt = -1; + hid_t st = H5I_INVALID_HID, dt = H5I_INVALID_HID; int64_t nmembs; int i; @@ -1850,7 +1850,7 @@ test_compound_9(void) goto error; } /* end if */ - if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str) != 0) { + if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || strcmp(rdata.str, wdata.str) != 0) { H5_FAILED(); AT(); printf("incorrect read data\n"); @@ -1924,7 +1924,7 @@ test_compound_9(void) goto error; } /* end if */ - if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str) != 0) { + if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || strcmp(rdata.str, wdata.str) != 0) { H5_FAILED(); AT(); printf("incorrect read data\n"); @@ -1998,12 +1998,12 @@ test_compound_10(void) for (i = 0; i < ARRAY_DIM; i++) { wdata[i].i1 = i * 10 + i; - wdata[i].str = HDstrdup("C string A"); + wdata[i].str = strdup("C string A"); wdata[i].str[9] = (char)(wdata[i].str[9] + i); wdata[i].i2 = i * 1000 + i * 10; - wdata[i].text.p = (void *)HDstrdup("variable-length text A\0"); - len = wdata[i].text.len = HDstrlen((char *)wdata[i].text.p) + 1; + wdata[i].text.p = (void *)strdup("variable-length text A\0"); + len = wdata[i].text.len = strlen((char *)wdata[i].text.p) + 1; ((char *)(wdata[i].text.p))[len - 2] = (char)(((char *)(wdata[i].text.p))[len - 2] + i); ((char *)(wdata[i].text.p))[len - 1] = '\0'; } @@ -2109,7 +2109,7 @@ test_compound_10(void) for (i = 0; i < ARRAY_DIM; i++) { if (rdata[i].i1 != wdata[i].i1 || rdata[i].i2 != wdata[i].i2 || - HDstrcmp(rdata[i].str, wdata[i].str) != 0) { + strcmp(rdata[i].str, wdata[i].str) != 0) { H5_FAILED(); AT(); printf("incorrect read data\n"); @@ -2125,7 +2125,7 @@ test_compound_10(void) t1 = rdata[i].text.p; t2 = wdata[i].text.p; - if (HDstrcmp((char *)t1, (char *)t2) != 0) { + if (strcmp((char *)t1, (char *)t2) != 0) { H5_FAILED(); AT(); printf("incorrect VL read data\n"); @@ -2264,7 +2264,7 @@ test_compound_11(void) ((big_t *)buf)[u].s1 = (char *)malloc((size_t)32); if (!((big_t *)buf)[u].s1) TEST_ERROR; - HDsnprintf(((big_t *)buf)[u].s1, 32, "%u", (unsigned)u); + snprintf(((big_t *)buf)[u].s1, 32, "%u", (unsigned)u); } /* end for */ /* Make copy of buffer before conversion */ @@ -2307,7 +2307,7 @@ test_compound_11(void) ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; } /* end if */ - else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { + else if (strcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; @@ -2358,7 +2358,7 @@ test_compound_11(void) ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; } /* end if */ - else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { + else if (strcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; @@ -2399,7 +2399,7 @@ test_compound_11(void) ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; } /* end if */ - else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { + else if (strcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; @@ -2525,7 +2525,7 @@ test_compound_12(void) H5E_END_TRY if (ret >= 0) { H5_FAILED(); - HDputs(" Tries to cut off the last member. Should have failed."); + puts(" Tries to cut off the last member. Should have failed."); goto error; } @@ -2971,14 +2971,14 @@ test_compound_14(void) goto error; } /* end if */ - if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || HDstrcmp(rdata1.str, wdata1.str) != 0) { + if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || strcmp(rdata1.str, wdata1.str) != 0) { H5_FAILED(); AT(); printf("incorrect read data\n"); goto error; } /* end if */ - if (rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || HDstrcmp(rdata2.str, wdata2.str) != 0 || + if (rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || strcmp(rdata2.str, wdata2.str) != 0 || rdata2.l1 != wdata2.l1 || rdata2.l2 != wdata2.l2 || rdata2.l3 != wdata2.l3 || rdata2.l4 != wdata2.l4) { H5_FAILED(); @@ -3069,14 +3069,14 @@ test_compound_14(void) goto error; } /* end if */ - if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || HDstrcmp(rdata1.str, wdata1.str) != 0) { + if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || strcmp(rdata1.str, wdata1.str) != 0) { H5_FAILED(); AT(); printf("incorrect read data\n"); goto error; } /* end if */ - if (rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || HDstrcmp(rdata2.str, wdata2.str) != 0 || + if (rdata2.c1 != wdata2.c1 || rdata2.c2 != wdata2.c2 || strcmp(rdata2.str, wdata2.str) != 0 || rdata2.l1 != wdata2.l1 || rdata2.l2 != wdata2.l2 || rdata2.l3 != wdata2.l3 || rdata2.l4 != wdata2.l4) { H5_FAILED(); @@ -3688,16 +3688,16 @@ error: static int test_compound_18(void) { - hid_t file = -1; - hid_t gid = -1; - hid_t did = -1; - hid_t aid = -1; - hid_t tid = -1; - hid_t sid = -1; + hid_t file = H5I_INVALID_HID; + hid_t gid = H5I_INVALID_HID; + hid_t did = H5I_INVALID_HID; + hid_t aid = H5I_INVALID_HID; + hid_t tid = H5I_INVALID_HID; + hid_t sid = H5I_INVALID_HID; hsize_t dim = 1; const char *testfile = H5_get_srcdir_filename(TESTFILE); /* Corrected test file name */ char filename[1024]; - hbool_t driver_is_default_compatible; + bool driver_is_default_compatible; herr_t ret; TESTING("accessing objects with compound datatypes that have no fields"); @@ -3842,7 +3842,7 @@ test_query(void) long c; double d; }; - hid_t file = -1, tid1 = -1, tid2 = -1; + hid_t file = H5I_INVALID_HID, tid1 = H5I_INVALID_HID, tid2 = H5I_INVALID_HID; char filename[1024]; char compnd_type[] = "Compound_type", enum_type[] = "Enum_type"; short enum_val; @@ -4028,7 +4028,7 @@ test_query(void) printf("Can't get name for enum member\n"); goto error; } /* end if */ - if (HDstrcmp("YELLOW", enum_name) != 0) { + if (strcmp("YELLOW", enum_name) != 0) { H5_FAILED(); printf("Incorrect name for enum member\n"); goto error; @@ -4081,10 +4081,11 @@ static int test_transient(hid_t fapl) { static hsize_t ds_size[2] = {10, 20}; - hid_t file = -1, type = -1, space = -1, dset = -1, t2 = -1; - char filename[1024]; - hid_t ret_id; /* Generic hid_t return value */ - herr_t status; + hid_t file = H5I_INVALID_HID, type = H5I_INVALID_HID, space = H5I_INVALID_HID, dset = H5I_INVALID_HID, + t2 = H5I_INVALID_HID; + char filename[1024]; + hid_t ret_id; /* Generic hid_t return value */ + herr_t status; TESTING("transient datatypes"); @@ -4103,7 +4104,7 @@ test_transient(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Predefined types should not be modifiable!"); + puts(" Predefined types should not be modifiable!"); goto error; } H5E_BEGIN_TRY @@ -4113,7 +4114,7 @@ test_transient(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Predefined types should not be closable!"); + puts(" Predefined types should not be closable!"); goto error; } @@ -4131,7 +4132,7 @@ test_transient(hid_t fapl) H5E_END_TRY if (ret_id >= 0) { H5_FAILED(); - HDputs(" Attributes should not be allowed for transient types!"); + puts(" Attributes should not be allowed for transient types!"); goto error; } @@ -4153,7 +4154,7 @@ test_transient(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Dataset datatypes should not be modifiable!"); + puts(" Dataset datatypes should not be modifiable!"); goto error; } if (H5Tclose(t2) < 0) @@ -4176,7 +4177,7 @@ test_transient(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Dataset datatypes should not be modifiable!"); + puts(" Dataset datatypes should not be modifiable!"); goto error; } if (H5Tclose(t2) < 0) @@ -4232,7 +4233,8 @@ error: static int test_named(hid_t fapl) { - hid_t file = -1, type = -1, space = -1, dset = -1, t2 = -1, t3 = -1, attr1 = -1; + hid_t file = H5I_INVALID_HID, type = H5I_INVALID_HID, space = H5I_INVALID_HID, dset = H5I_INVALID_HID, + t2 = H5I_INVALID_HID, t3 = H5I_INVALID_HID, attr1 = H5I_INVALID_HID; herr_t status; static hsize_t ds_size[2] = {10, 20}; size_t i, j; @@ -4257,7 +4259,7 @@ test_named(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Predefined types should not be committable!"); + puts(" Predefined types should not be committable!"); goto error; } @@ -4270,7 +4272,7 @@ test_named(hid_t fapl) goto error; if (0 == status) { H5_FAILED(); - HDputs(" H5Tcommitted() returned false!"); + puts(" H5Tcommitted() returned false!"); goto error; } @@ -4282,7 +4284,7 @@ test_named(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Committed type is not constant!"); + puts(" Committed type is not constant!"); goto error; } @@ -4295,7 +4297,7 @@ test_named(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Committed types should not be recommitted!"); + puts(" Committed types should not be recommitted!"); goto error; } @@ -4320,7 +4322,7 @@ test_named(hid_t fapl) goto error; if (status) { H5_FAILED(); - HDputs(" Copying a named type should result in a transient type!"); + puts(" Copying a named type should result in a transient type!"); goto error; } if (H5Tset_precision(t2, (size_t)256) < 0) @@ -4339,7 +4341,7 @@ test_named(hid_t fapl) goto error; if (!status) { H5_FAILED(); - HDputs(" Opened named types should be named types!"); + puts(" Opened named types should be named types!"); goto error; } @@ -4354,7 +4356,7 @@ test_named(hid_t fapl) goto error; if (!status) { H5_FAILED(); - HDputs(" Dataset type should be a named type!"); + puts(" Dataset type should be a named type!"); goto error; } @@ -4373,7 +4375,7 @@ test_named(hid_t fapl) goto error; if (!status) { H5_FAILED(); - HDputs(" Dataset type should be a named type!"); + puts(" Dataset type should be a named type!"); goto error; } @@ -4399,7 +4401,7 @@ test_named(hid_t fapl) goto error; if (!status) { H5_FAILED(); - HDputs(" Dataset type should be a named type!"); + puts(" Dataset type should be a named type!"); goto error; } if (H5Tclose(t2) < 0) @@ -4427,7 +4429,7 @@ test_named(hid_t fapl) goto error; if (status) { H5_FAILED(); - HDputs(" Copied type should not be a named type!"); + puts(" Copied type should not be a named type!"); goto error; } if ((dset = H5Dcreate2(file, "dset3", t2, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -4438,7 +4440,7 @@ test_named(hid_t fapl) goto error; if (status) { H5_FAILED(); - HDputs(" Datatype from dataset using copied type should not be a named type!"); + puts(" Datatype from dataset using copied type should not be a named type!"); goto error; } if (H5Tclose(t3) < 0) @@ -4469,7 +4471,7 @@ test_named(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Types should not be committable to a read-only file!"); + puts(" Types should not be committable to a read-only file!"); goto error; } @@ -4483,7 +4485,7 @@ test_named(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Types should not be committable to a read-only file!"); + puts(" Types should not be committable to a read-only file!"); goto error; } @@ -4550,7 +4552,7 @@ test_str_create(void) { hid_t fixed_str1, fixed_str2; hid_t vlen_str1, vlen_str2; - htri_t is_vl_str = FALSE; + htri_t is_vl_str = false; size_t query_size, str_size = 10; TESTING("string type creation using H5Tcreate"); @@ -4631,8 +4633,8 @@ static int test_conv_str_1(void) { char *buf = NULL; - hid_t src_type = -1; - hid_t dst_type = -1; + hid_t src_type = H5I_INVALID_HID; + hid_t dst_type = H5I_INVALID_HID; TESTING("string conversions"); @@ -4651,14 +4653,14 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcd\0abcd\0abcdefghi\0", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Truncated C-string test failed"); + puts(" Truncated C-string test failed"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; if (memcmp(buf, "abcd\0\0\0\0\0\0abcd\0\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Extended C-string test failed"); + puts(" Extended C-string test failed"); goto error; } free(buf); @@ -4682,14 +4684,14 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Truncated C buffer test failed"); + puts(" Truncated C buffer test failed"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Extended C buffer test failed"); + puts(" Extended C buffer test failed"); goto error; } free(buf); @@ -4713,14 +4715,14 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Truncated Fortran-string test failed"); + puts(" Truncated Fortran-string test failed"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; if (memcmp(buf, "abcde abcde ", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Extended Fortran-string test failed"); + puts(" Extended Fortran-string test failed"); goto error; } free(buf); @@ -4747,7 +4749,7 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Non-terminated string test 1"); + puts(" Non-terminated string test 1"); goto error; } H5Tclose(dst_type); @@ -4758,7 +4760,7 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcd\0abcd\0abcdefghij", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Non-terminated string test 2"); + puts(" Non-terminated string test 2"); goto error; } memcpy(buf, "abcdeabcdexxxxxxxxxx", (size_t)20); @@ -4766,7 +4768,7 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Non-terminated string test 2"); + puts(" Non-terminated string test 2"); goto error; } free(buf); @@ -4790,14 +4792,14 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcdefghi abcdefghi ", (size_t)20) != 0) { H5_FAILED(); - HDputs(" C string to Fortran test 1"); + puts(" C string to Fortran test 1"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; if (memcmp(buf, "abcdefghi\0abcdefghi\0", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Fortran to C string test 1"); + puts(" Fortran to C string test 1"); goto error; } if (H5Tclose(dst_type) < 0) @@ -4809,14 +4811,14 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { H5_FAILED(); - HDputs(" C string to Fortran test 2"); + puts(" C string to Fortran test 2"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Fortran to C string test 2"); + puts(" Fortran to C string test 2"); goto error; } if (H5Tclose(src_type) < 0) @@ -4832,14 +4834,14 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcd abcd ", (size_t)20) != 0) { H5_FAILED(); - HDputs(" C string to Fortran test 3"); + puts(" C string to Fortran test 3"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; if (memcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Fortran to C string test 3"); + puts(" Fortran to C string test 3"); goto error; } free(buf); @@ -4863,14 +4865,14 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { H5_FAILED(); - HDputs(" C buffer to Fortran test 1"); + puts(" C buffer to Fortran test 1"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; if (memcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Fortran to C buffer test 1"); + puts(" Fortran to C buffer test 1"); goto error; } if (H5Tclose(dst_type) < 0) @@ -4882,14 +4884,14 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { H5_FAILED(); - HDputs(" C buffer to Fortran test 2"); + puts(" C buffer to Fortran test 2"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Fortran to C buffer test 2"); + puts(" Fortran to C buffer test 2"); goto error; } if (H5Tclose(src_type) < 0) @@ -4905,14 +4907,14 @@ test_conv_str_1(void) goto error; if (memcmp(buf, "abcd abcd ", (size_t)20) != 0) { H5_FAILED(); - HDputs(" C buffer to Fortran test 3"); + puts(" C buffer to Fortran test 3"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; if (memcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { H5_FAILED(); - HDputs(" Fortran to C buffer test 3"); + puts(" Fortran to C buffer test 3"); goto error; } if (H5Tclose(src_type) < 0) @@ -4962,8 +4964,8 @@ static int test_conv_str_2(void) { char *buf = NULL, s[80]; - hid_t c_type = -1; - hid_t f_type = -1; + hid_t c_type = H5I_INVALID_HID; + hid_t f_type = H5I_INVALID_HID; const size_t nelmts = NTESTELEM; size_t i, j, nchars; int ret_value = 1; @@ -4986,7 +4988,7 @@ test_conv_str_2(void) } /* end for */ /* Do the conversions */ - HDsnprintf(s, sizeof(s), "Testing random string conversion speed"); + snprintf(s, sizeof(s), "Testing random string conversion speed"); printf("%-70s", s); fflush(stdout); if (H5Tconvert(c_type, f_type, nelmts, buf, NULL, H5P_DEFAULT) < 0) @@ -5031,8 +5033,8 @@ static int test_conv_str_3(void) { char *buf = NULL; - hid_t type = -1; - hid_t super = -1; + hid_t type = H5I_INVALID_HID; + hid_t super = H5I_INVALID_HID; const size_t nelmts = NTESTELEM; size_t i, j, nchars; int ret_value = 1; @@ -5168,8 +5170,8 @@ test_conv_enum_1(void) { const size_t nelmts = NTESTELEM; int i, val, *buf = NULL; - hid_t t1 = -1; - hid_t t2 = -1; + hid_t t1 = H5I_INVALID_HID; + hid_t t2 = H5I_INVALID_HID; char s[80]; int ret_value = 1; size_t u; @@ -5194,14 +5196,14 @@ test_conv_enum_1(void) buf[u] = HDrand() % 26; /* Conversions */ - HDsnprintf(s, sizeof(s), "Testing random enum conversion O(N)"); + snprintf(s, sizeof(s), "Testing random enum conversion O(N)"); printf("%-70s", s); fflush(stdout); if (H5Tconvert(t1, t2, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error; PASSED(); - HDsnprintf(s, sizeof(s), "Testing random enum conversion O(N log N)"); + snprintf(s, sizeof(s), "Testing random enum conversion O(N log N)"); printf("%-70s", s); fflush(stdout); if (H5Tconvert(t2, t1, nelmts, buf, NULL, H5P_DEFAULT) < 0) @@ -5243,7 +5245,7 @@ error: static int test_conv_enum_2(void) { - hid_t srctype = -1, dsttype = -1, oddsize = -1; + hid_t srctype = H5I_INVALID_HID, dsttype = H5I_INVALID_HID, oddsize = H5I_INVALID_HID; int *data = NULL, i, nerrors = 0; const char *mname[] = {"RED", "GREEN", "BLUE", "YELLOW", "PINK", "PURPLE", "ORANGE", "WHITE"}; @@ -5317,7 +5319,7 @@ static int test_conv_bitfield(void) { unsigned char buf[4]; - hid_t st = -1, dt = -1; + hid_t st = H5I_INVALID_HID, dt = H5I_INVALID_HID; TESTING("bitfield conversions"); @@ -5411,7 +5413,7 @@ error: static int test_bitfield_funcs(void) { - hid_t type = -1, ntype = -1, super = -1; + hid_t type = H5I_INVALID_HID, ntype = H5I_INVALID_HID, super = H5I_INVALID_HID; size_t size; char *tag = 0; H5T_pad_t inpad; @@ -5613,7 +5615,7 @@ static int opaque_check(int tag_it) { #define OPAQUE_NELMTS 1000 - hid_t st = -1, dt = -1; + hid_t st = H5I_INVALID_HID, dt = H5I_INVALID_HID; herr_t status; char buf[1]; /*not really used*/ int saved; @@ -5689,7 +5691,7 @@ static int opaque_long(void) { char *long_tag = NULL; - hid_t dt = -1; + hid_t dt = H5I_INVALID_HID; herr_t ret; /* Build opaque type */ @@ -5743,7 +5745,7 @@ error: static int opaque_funcs(void) { - hid_t type = -1, super = -1; + hid_t type = H5I_INVALID_HID, super = H5I_INVALID_HID; size_t size; H5T_pad_t inpad; H5T_cset_t cset; @@ -6455,9 +6457,9 @@ test_latest(void) long c; double d; }; - hid_t file = (-1); /* File ID */ - hid_t tid1 = (-1), tid2 = (-1); /* Datatype ID */ - hid_t fapl = (-1); /* File access property list */ + hid_t file = (H5I_INVALID_HID); /* File ID */ + hid_t tid1 = (H5I_INVALID_HID), tid2 = (H5I_INVALID_HID); /* Datatype ID */ + hid_t fapl = (H5I_INVALID_HID); /* File access property list */ H5O_native_info_t oi; /* Stat buffer for committed datatype */ hsize_t old_dtype_oh_size; /* Size of object header with "old" format */ hsize_t new_dtype_oh_size; /* Size of object header with "new" format */ @@ -6800,7 +6802,7 @@ test_int_float_except(void) PASSED(); #else /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */ SKIPPED(); - HDputs(" Test skipped due to int or float not 4 bytes."); + puts(" Test skipped due to int or float not 4 bytes."); #endif /* H5_SIZEOF_INT==4 && H5_SIZEOF_FLOAT==4 */ return 0; @@ -7073,9 +7075,10 @@ test_set_order_compound(hid_t fapl) atomic_cmpd d[3][4]; } complex_cmpd; - hid_t file = -1; - hid_t cmpd = -1, memb_cmpd = -1, memb_array1 = -1, memb_array2 = -1, cmpd_array = -1; - hid_t vl_id = -1; + hid_t file = H5I_INVALID_HID; + hid_t cmpd = H5I_INVALID_HID, memb_cmpd = H5I_INVALID_HID, memb_array1 = H5I_INVALID_HID, + memb_array2 = H5I_INVALID_HID, cmpd_array = H5I_INVALID_HID; + hid_t vl_id = H5I_INVALID_HID; hsize_t dims[2] = {3, 4}; /* Array dimensions */ char filename[1024]; herr_t ret; /* Generic return value */ @@ -7224,7 +7227,8 @@ error: static int test_named_indirect_reopen(hid_t fapl) { - hid_t file = -1, type = -1, reopened_type = -1, strtype = -1, dset = -1, space = -1; + hid_t file = H5I_INVALID_HID, type = H5I_INVALID_HID, reopened_type = H5I_INVALID_HID, + strtype = H5I_INVALID_HID, dset = H5I_INVALID_HID, space = H5I_INVALID_HID; static hsize_t dims[1] = {3}; size_t dt_size; int enum_value; @@ -7384,7 +7388,7 @@ test_named_indirect_reopen(hid_t fapl) TEST_ERROR; if (NULL == (tag_ret = H5Tget_tag(type))) TEST_ERROR; - if (HDstrcmp(tag, tag_ret) != 0) + if (strcmp(tag, tag_ret) != 0) TEST_ERROR; H5free_memory(tag_ret); tag_ret = NULL; @@ -7400,7 +7404,7 @@ test_named_indirect_reopen(hid_t fapl) TEST_ERROR; if (NULL == (tag_ret = H5Tget_tag(type))) TEST_ERROR; - if (HDstrcmp(tag, tag_ret) != 0) + if (strcmp(tag, tag_ret) != 0) TEST_ERROR; H5free_memory(tag_ret); tag_ret = NULL; @@ -7592,11 +7596,11 @@ create_del_obj_named_test_file(const char *filename, hid_t fapl, H5F_libver_t lo static int test_delete_obj_named(hid_t fapl) { - hid_t filea1 = -1, filea2 = -1, fileb = -1; /* File IDs */ - hid_t attr = -1; /* Attribute ID */ - hid_t dset = -1; /* Dataset ID */ - hid_t fapl2 = -1; /* File access property list ID */ - H5F_libver_t low, high; /* File format bounds */ + hid_t filea1 = H5I_INVALID_HID, filea2 = H5I_INVALID_HID, fileb = H5I_INVALID_HID; /* File IDs */ + hid_t attr = H5I_INVALID_HID; /* Attribute ID */ + hid_t dset = H5I_INVALID_HID; /* Dataset ID */ + hid_t fapl2 = H5I_INVALID_HID; /* File access property list ID */ + H5F_libver_t low, high; /* File format bounds */ char filename[1024], filename2[1024]; TESTING("deleting objects that use named datatypes"); @@ -7709,15 +7713,15 @@ error: static int test_delete_obj_named_fileid(hid_t fapl) { - hid_t filea1 = -1, filea2 = -1, fileb = -1; /* File IDs */ - hid_t dset_fid = -1; /* File ID from dataset */ - hid_t type_fid = -1; /* File ID from datatype */ - hid_t attr_fid = -1; /* File ID from attribute */ - hid_t type = -1; /* Datatype ID */ - hid_t attr = -1; /* Attribute ID */ - hid_t dset = -1; /* Dataset ID */ - hid_t fapl2 = -1; /* File access property list ID */ - H5F_libver_t low, high; /* File format bounds */ + hid_t filea1 = H5I_INVALID_HID, filea2 = H5I_INVALID_HID, fileb = H5I_INVALID_HID; /* File IDs */ + hid_t dset_fid = H5I_INVALID_HID; /* File ID from dataset */ + hid_t type_fid = H5I_INVALID_HID; /* File ID from datatype */ + hid_t attr_fid = H5I_INVALID_HID; /* File ID from attribute */ + hid_t type = H5I_INVALID_HID; /* Datatype ID */ + hid_t attr = H5I_INVALID_HID; /* Attribute ID */ + hid_t dset = H5I_INVALID_HID; /* Dataset ID */ + hid_t fapl2 = H5I_INVALID_HID; /* File access property list ID */ + H5F_libver_t low, high; /* File format bounds */ char filename[1024], filename2[1024]; TESTING("deleting objects that use named datatypes"); @@ -7908,14 +7912,14 @@ error: static int test_deprec(hid_t fapl) { - hid_t file = -1; /* File ID */ - hid_t type = -1; /* Datatype ID */ - unsigned rank = 2; /* Rank for array datatype */ - hsize_t dims[2] = {3, 3}; /* Dimensions for array datatype */ - int perm[2] = {0, 1}; /* Dimensions permutations for array datatype */ - hsize_t rdims[2] = {0, 0}; /* Dimensions for querying array datatype */ - int rperm[2] = {-2, -2}; /* Dimensions permutations for array datatype */ - hbool_t dim_mismatch; /* Whether any dimensions didn't match */ + hid_t file = H5I_INVALID_HID; /* File ID */ + hid_t type = H5I_INVALID_HID; /* Datatype ID */ + unsigned rank = 2; /* Rank for array datatype */ + hsize_t dims[2] = {3, 3}; /* Dimensions for array datatype */ + int perm[2] = {0, 1}; /* Dimensions permutations for array datatype */ + hsize_t rdims[2] = {0, 0}; /* Dimensions for querying array datatype */ + int rperm[2] = {-2, -2}; /* Dimensions permutations for array datatype */ + bool dim_mismatch; /* Whether any dimensions didn't match */ char filename[1024]; unsigned u; /* Local index variable */ herr_t status; /* Generic routine value */ @@ -7928,9 +7932,9 @@ test_deprec(hid_t fapl) FAIL_STACK_ERROR; /* Make certain that the correct classes can be detected */ - if (H5Tdetect_class(type, H5T_ARRAY) != TRUE) + if (H5Tdetect_class(type, H5T_ARRAY) != true) FAIL_STACK_ERROR; - if (H5Tdetect_class(type, H5T_INTEGER) != TRUE) + if (H5Tdetect_class(type, H5T_INTEGER) != true) FAIL_STACK_ERROR; /* Get the array dimensions */ @@ -7939,24 +7943,24 @@ test_deprec(hid_t fapl) FAIL_STACK_ERROR; /* Check the array dimensions */ - dim_mismatch = FALSE; + dim_mismatch = false; for (u = 0; u < rank; u++) if (rdims[u] != dims[u]) { TestErrPrintf("Array dimension information doesn't match!, rdims1[%u]=%d, tdims1[%u]=%d\n", u, (int)rdims[u], u, (int)dims[u]); - dim_mismatch = TRUE; + dim_mismatch = true; } /* end if */ if (dim_mismatch) FAIL_PUTS_ERROR(" Dimensions didn't match!"); /* Check the array dimension permutations */ - dim_mismatch = FALSE; + dim_mismatch = false; for (u = 0; u < rank; u++) if (rperm[u] != -2) { TestErrPrintf( "Array dimension permutation information was modified!, rdims1[%u]=%d, tdims1[%u]=%d\n", u, rperm[u], u, perm[u]); - dim_mismatch = TRUE; + dim_mismatch = true; } /* end if */ if (dim_mismatch) FAIL_PUTS_ERROR(" Dimension permutations modified!"); @@ -8038,7 +8042,7 @@ test_deprec(hid_t fapl) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" Types should not be committable to a read-only file!"); + puts(" Types should not be committable to a read-only file!"); goto error; } @@ -8076,13 +8080,13 @@ error: static int test_utf_ascii_conv(void) { - hid_t fid = -1; - hid_t did = -1; - hid_t utf8_vtid = -1; - hid_t ascii_vtid = -1; - hid_t utf8_tid = -1; - hid_t ascii_tid = -1; - hid_t sid = -1; + hid_t fid = H5I_INVALID_HID; + hid_t did = H5I_INVALID_HID; + hid_t utf8_vtid = H5I_INVALID_HID; + hid_t ascii_vtid = H5I_INVALID_HID; + hid_t utf8_tid = H5I_INVALID_HID; + hid_t ascii_tid = H5I_INVALID_HID; + hid_t sid = H5I_INVALID_HID; const char *utf8_w = "foo!"; char *ascii_r = NULL; const char *ascii_w = "bar!"; @@ -8340,8 +8344,8 @@ error: static herr_t verify_version(hid_t dtype, H5F_libver_t low, unsigned *highest_version) { - hid_t base_dtype = -1; - hid_t mem_dtype = -1; + hid_t base_dtype = H5I_INVALID_HID; + hid_t mem_dtype = H5I_INVALID_HID; H5T_t *dtypep = NULL; /* Internal structure of a datatype */ H5T_class_t type_cls = H5T_NO_CLASS; /* Temporary var for datatype class */ int nmembers = 0; @@ -8509,25 +8513,25 @@ test_versionbounds(void) color_t enum_color; } outer_cmp_t; - hid_t file = -1; /* File ID */ - hid_t space = -1; /* Dataspace ID */ - hid_t dset = -1; /* Dataset ID */ - hid_t fcpl = -1; /* File creation property list ID */ - hid_t fapl = -1; /* Copy of file access property list ID */ - hid_t dcpl = -1; /* Dataset creation property list ID */ - hid_t dset_dtype = -1; /* Dataset's datatype */ - hid_t arr_chartype = -1; /* Array of characters datatype */ - hid_t vlen_floattype = -1; /* Vlen of float datatype */ - hid_t enum_type = -1; /* Enumeration datatype */ - hid_t outer_cmp_type = -1; /* Outer compound datatype */ - hid_t inner_cmp_type = -1; /* Inner compound datatype */ - hid_t simple_cmp_type = -1; /* Simple cmpd dtype, contains no other cmpd */ - hid_t outer_arr_type = -1; /* Outermost array datatype */ - hid_t inner_arr_type = -1; /* Inner array datatype */ - H5F_t *filep = NULL; /* Pointer to internal structure of a file */ - H5T_t *dtypep = NULL; /* Pointer to internal structure of a datatype */ - hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */ - int low, high; /* Indices for iterating over versions */ + hid_t file = H5I_INVALID_HID; /* File ID */ + hid_t space = H5I_INVALID_HID; /* Dataspace ID */ + hid_t dset = H5I_INVALID_HID; /* Dataset ID */ + hid_t fcpl = H5I_INVALID_HID; /* File creation property list ID */ + hid_t fapl = H5I_INVALID_HID; /* Copy of file access property list ID */ + hid_t dcpl = H5I_INVALID_HID; /* Dataset creation property list ID */ + hid_t dset_dtype = H5I_INVALID_HID; /* Dataset's datatype */ + hid_t arr_chartype = H5I_INVALID_HID; /* Array of characters datatype */ + hid_t vlen_floattype = H5I_INVALID_HID; /* Vlen of float datatype */ + hid_t enum_type = H5I_INVALID_HID; /* Enumeration datatype */ + hid_t outer_cmp_type = H5I_INVALID_HID; /* Outer compound datatype */ + hid_t inner_cmp_type = H5I_INVALID_HID; /* Inner compound datatype */ + hid_t simple_cmp_type = H5I_INVALID_HID; /* Simple cmpd dtype, contains no other cmpd */ + hid_t outer_arr_type = H5I_INVALID_HID; /* Outermost array datatype */ + hid_t inner_arr_type = H5I_INVALID_HID; /* Inner array datatype */ + H5F_t *filep = NULL; /* Pointer to internal structure of a file */ + H5T_t *dtypep = NULL; /* Pointer to internal structure of a datatype */ + hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */ + int low, high; /* Indices for iterating over versions */ H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, H5F_LIBVER_V112, H5F_LIBVER_V114, H5F_LIBVER_V114}; int versions_count = 6; /* Number of version bounds in the array */ @@ -8746,9 +8750,9 @@ error: int main(void) { - hbool_t driver_is_parallel; - long nerrors = 0; - hid_t fapl = H5I_INVALID_HID; + bool driver_is_parallel; + long nerrors = 0; + hid_t fapl = H5I_INVALID_HID; /* Set the random # seed */ HDsrandom((unsigned)HDtime(NULL)); |