From 95572568191492f0d79924a55ea10453095a20c1 Mon Sep 17 00:00:00 2001 From: jhendersonHDF Date: Tue, 17 Oct 2023 23:54:40 -0500 Subject: [PATCH] Sync changes that are only in 1.14 branch (#3704) --- CMakePresets.json | 3 ++- config/cmake-presets/hidden-presets.json | 3 ++- config/cmake/ConfigureChecks.cmake | 2 +- config/cmake/runTest.cmake | 16 ---------------- config/sanitizer/README.md | 3 ++- doxygen/examples/H5D_examples.c | 2 +- fortran/src/H5Fff.F90 | 1 + fortran/src/H5Lff.F90 | 3 +++ src/H5Olayout.c | 1 + tools/test/misc/talign.c | 2 +- 10 files changed, 14 insertions(+), 22 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 6d1a12fdff6..7b70970b17b 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -263,4 +263,5 @@ ] } ] -} \ No newline at end of file +} + diff --git a/config/cmake-presets/hidden-presets.json b/config/cmake-presets/hidden-presets.json index bd36153c278..fad63b7b387 100644 --- a/config/cmake-presets/hidden-presets.json +++ b/config/cmake-presets/hidden-presets.json @@ -488,4 +488,5 @@ ] } ] -} \ No newline at end of file +} + diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index f847457f5a0..3d4c23b362c 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -909,7 +909,7 @@ endmacro () #----------------------------------------------------------------------------- # ---------------------------------------------------------------------- -# Set the flag to indicate that the machine is using a special algorithm toconvert +# Set the flag to indicate that the machine is using a special algorithm to convert # 'long double' to '(unsigned) long' values. (This flag should only be set for # the IBM Power Linux. When the bit sequence of long double is # 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake index 1304d36735b..d21765a8e36 100644 --- a/config/cmake/runTest.cmake +++ b/config/cmake/runTest.cmake @@ -218,14 +218,6 @@ if (NOT TEST_SKIP_COMPARE) file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) list (LENGTH TEST_STREAM test_len) if (test_len GREATER 0) - # if (WIN32) # no longer needed for CMake > 3.15 - # configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF) - # if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp") - # file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) - # endif () - # #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) - # #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}") - # endif () if (NOT TEST_SORT_COMPARE) # now compare the output with the reference @@ -293,14 +285,6 @@ if (NOT TEST_SKIP_COMPARE) file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM) list (LENGTH TEST_STREAM test_len) if (test_len GREATER 0) - # if (WIN32) # no longer needed for CMake > 3.15 - # configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF) - # if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp") - # file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF}) - # endif () - # #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM) - # #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}") - # endif () # now compare the error output with the error reference execute_process ( diff --git a/config/sanitizer/README.md b/config/sanitizer/README.md index 308f9c393aa..e3141455401 100644 --- a/config/sanitizer/README.md +++ b/config/sanitizer/README.md @@ -304,4 +304,5 @@ file(GLOB_RECURSE CMAKE_FILES ) cmake_format(TARGET_NAME ${CMAKE_FILES}) -``` \ No newline at end of file +``` + diff --git a/doxygen/examples/H5D_examples.c b/doxygen/examples/H5D_examples.c index ae483ee5566..1ad27947ee6 100644 --- a/doxygen/examples/H5D_examples.c +++ b/doxygen/examples/H5D_examples.c @@ -10,7 +10,7 @@ int chunk_cb(const hsize_t *offset, unsigned filter_mask, haddr_t addr, hsize_t size, void *op_data) { // only print the allocated chunk size only - printf("%ld\n", size); + printf("%" PRIuHSIZE "\n", size); return EXIT_SUCCESS; } //! diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90 index cfae7652e63..fee4d3c7cf8 100644 --- a/fortran/src/H5Fff.F90 +++ b/fortran/src/H5Fff.F90 @@ -43,6 +43,7 @@ MODULE H5F ! Number of objects opened in H5open_f INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ + #ifndef H5_DOXYGEN INTERFACE INTEGER(C_INT) FUNCTION h5fis_accessible(name, & diff --git a/fortran/src/H5Lff.F90 b/fortran/src/H5Lff.F90 index bedfb8c6acc..004e5b23fdd 100644 --- a/fortran/src/H5Lff.F90 +++ b/fortran/src/H5Lff.F90 @@ -753,6 +753,9 @@ END FUNCTION H5Lexists hdferr = 0 IF(link_exists_c.LT.0_C_INT) hdferr = -1 + hdferr = 0 + IF(link_exists_c.LT.0) hdferr = -1 + END SUBROUTINE h5lexists_f !> diff --git a/src/H5Olayout.c b/src/H5Olayout.c index a686ce49e1c..1f2b6862b6e 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -591,6 +591,7 @@ H5O__layout_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNU /* Avoid zero-size allocation */ mesg->storage.u.virt.list = NULL; } + mesg->storage.u.virt.list_nalloc = (size_t)tmp_hsize; mesg->storage.u.virt.list_nused = (size_t)tmp_hsize; diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c index 2387be4b670..7de9d1afe5c 100644 --- a/tools/test/misc/talign.c +++ b/tools/test/misc/talign.c @@ -179,7 +179,7 @@ main(void) " %6f = %f\n", (double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0], (double)fptr[2], (double)fnok[1], (double)fptr[3]); - puts("*FAILED - compound type alignmnent problem*"); + puts("*FAILED - compound type alignment problem*"); } else { puts(" PASSED");