diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-27 22:00:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 22:00:07 (GMT) |
| commit | 0e82707100cf3d1b698d2ec0cad08db61d552d63 (patch) | |
| tree | 6d8c9adf10cb2f52f7ad33b93e30ee0aef3125e0 | |
| parent | 61186204c020a81b5b0044a3b5e08311ccf1424d (diff) | |
| download | hdf5-0e82707100cf3d1b698d2ec0cad08db61d552d63.zip hdf5-0e82707100cf3d1b698d2ec0cad08db61d552d63.tar.gz hdf5-0e82707100cf3d1b698d2ec0cad08db61d552d63.tar.bz2 | |
Misc missed things from previous merges (#3295)
87 files changed, 218 insertions, 302 deletions
diff --git a/bin/make_err b/bin/make_err index 39c6ce5..0bb89a1 100755 --- a/bin/make_err +++ b/bin/make_err @@ -241,7 +241,7 @@ sub create_init ($) { print HEADER "/* Major error codes */\n"; print HEADER "/*********************/\n\n"; foreach $name (keys %major) { - print HEADER " "x(0*$indent),"HDassert(${name}_g==(-1));\n"; + print HEADER " "x(0*$indent),"assert(${name}_g==(-1));\n"; print HEADER " "x(0*$indent),"if((msg = H5E__create_msg(cls, H5E_MAJOR, \"${major{$name}}\"))==NULL)\n"; print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\")\n"; print HEADER " "x(0*$indent),"if((${name}_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)\n"; @@ -257,7 +257,7 @@ sub create_init ($) { # Iterate over all the minor errors in each section for $name ( @{$section_list{$sect_name}}) { - print HEADER " "x(0*$indent),"HDassert(${name}_g==(-1));\n"; + print HEADER " "x(0*$indent),"assert(${name}_g==(-1));\n"; print HEADER " "x(0*$indent),"if((msg = H5E__create_msg(cls, H5E_MINOR, \"${minor{$name}}\"))==NULL)\n"; print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\")\n"; print HEADER " "x(0*$indent),"if((${name}_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)\n"; diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 01fe139..e518b85 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -138,7 +138,7 @@ endif () ## Check for non-standard extension quadmath.h CHECK_INCLUDE_FILES(quadmath.h C_HAVE_QUADMATH) -if (${C_HAVE_QUADMATH}) +if (C_HAVE_QUADMATH) set(${HDF_PREFIX}_HAVE_QUADMATH_H 1) else () set(${HDF_PREFIX}_HAVE_QUADMATH_H 0) @@ -767,7 +767,7 @@ endif() if (HDF5_BUILD_FORTRAN) HDF_CHECK_TYPE_SIZE(__float128 _SIZEOF___FLOAT128) - if (${_SIZEOF___FLOAT128}) + if (_SIZEOF___FLOAT128) set (${HDF_PREFIX}_HAVE_FLOAT128 1) set (${HDF_PREFIX}_SIZEOF___FLOAT128 ${_SIZEOF___FLOAT128}) else () @@ -776,7 +776,7 @@ if (HDF5_BUILD_FORTRAN) endif () HDF_CHECK_TYPE_SIZE(_Quad _SIZEOF__QUAD) - if (NOT ${_SIZEOF__QUAD}) + if (NOT _SIZEOF__QUAD) set (${HDF_PREFIX}_SIZEOF__QUAD 0) else () set (${HDF_PREFIX}_SIZEOF__QUAD ${_SIZEOF__QUAD}) @@ -856,7 +856,7 @@ if (HDF5_BUILD_FORTRAN) #define C_LDBL_DIG DECIMAL_DIG\n\ #else\n\ #define C_LDBL_DIG LDBL_DIG\n\ -#endif\n\nint main() {\nprintf(\"\\%d\\\;\\%d\\\;\", C_LDBL_DIG, C_FLT128_DIG)\\\;\n\nreturn 0\\\;\n}\n +#endif\n\nint main(void) {\nprintf(\"\\%d\\\;\\%d\\\;\", C_LDBL_DIG, C_FLT128_DIG)\\\;\n\nreturn 0\\\;\n}\n " ) @@ -924,9 +924,9 @@ endmacro () #----------------------------------------------------------------------------- # ---------------------------------------------------------------------- -# Set the flag to indicate that the machine is using a special algorithm to convert +# Set the flag to indicate that the machine is using a special algorithm toconvert # 'long double' to '(unsigned) long' values. (This flag should only be set for -# the IBM Power6 Linux. When the bit sequence of long double is +# the IBM Power Linux. When the bit sequence of long double is # 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long # is 0x004733ce17af227f, not the same as the library's conversion to 0x004733ce17af2282. # The machine's conversion gets the correct value. We define the macro and disable @@ -936,7 +936,7 @@ H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LONG_SPECIAL "Checking IF your syst # ---------------------------------------------------------------------- # Set the flag to indicate that the machine is using a special algorithm # to convert some values of '(unsigned) long' to 'long double' values. -# (This flag should be off for all machines, except for IBM Power6 Linux, +# (This flag should be off for all machines, except for IBM Power Linux, # when the bit sequences are 003fff..., 007fff..., 00ffff..., 01ffff..., # ..., 7fffff..., the compiler uses a unknown algorithm. We define a # macro and skip the test for now until we know about the algorithm. diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c index 80de31f..725f049 100644 --- a/config/cmake/ConversionTests.c +++ b/config/cmake/ConversionTests.c @@ -56,9 +56,11 @@ int HDF_NO_UBSAN main(void) ll = (long)ld; memcpy(s2, &ll, 8); - /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82 - * and gets wrong value 20041683600089730 on the IBM Power6 Linux. - * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f + /* The library's algorithm converts it to 0x00 47 33 ce 17 af 22 82 + * and gets wrong value 20041683600089730 on Linux on IBM Power + * architecture. + * + * But Linux on IBM Power converts it to 0x00 47 33 ce 17 af 22 7f * and gets the correct value 20041683600089727. It uses some special * algorithm. We're going to define the macro and skip the test until * we can figure out how they do it. @@ -118,10 +120,11 @@ int HDF_NO_UBSAN main(void) /* The library converts the value to 0x434fffffffffffff8000000000000000. * In decimal it is 18014398509481982.000000, one value short of the original. - * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000. - * The value is correct in decimal. It uses some special - * algorithm. We're going to define the macro and skip the test until - * we can figure out how they do it. + * + * Linux on IBM Power architecture converts it to + * 0x4350000000000000bff0000000000000. The value is correct in decimal. + * It uses some special algorithm. We're going to define the macro and + * skip the test until we can figure out how they do it. */ if (s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 && s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 && @@ -136,14 +139,14 @@ int HDF_NO_UBSAN main(void) ld = (long double)ull; memcpy(s, &ld, 16); - /* Use a different value from signed long to test. The problem is the same - * for both long and unsigned long. The value is 18446744073709551615. + /* Use a different value from signed long to test. The problem is the + * same for both long and unsigned long. The value is 18446744073709551615. * The library converts the value to 0x43effffffffffffffe000000000000000. - * In decimal it's 18446744073709548544.000000, very different from the original. - * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000. - * The value is correct in decimal. It uses some special - * algorithm. We're going to define the macro and skip the test until - * we can figure out how they do it. + * In decimal it's 18446744073709548544.000000, very different from the + * original. Linux on IBM Power architecture converts it to + * 0x43f0000000000000bff0000000000000. The value is correct in decimal. + * It uses some special algorithm. We're going to define the macro and + * skip the test until we can figure out how they do it. */ if (s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 && s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 && diff --git a/config/cmake/HDFTests.c b/config/cmake/HDFTests.c index 96460d7..3897390 100644 --- a/config/cmake/HDFTests.c +++ b/config/cmake/HDFTests.c @@ -12,7 +12,7 @@ /* A simple test program to see if a function "works" */ -#define SIMPLE_TEST(x) int main(){ x; return 0; } +#define SIMPLE_TEST(x) int main(void){ x; return 0; } #ifdef HAVE_ATTRIBUTE @@ -93,7 +93,7 @@ int main () #include <sys/types.h> -int main() +int main(void) { off64_t n = 0; return (int)n; diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in index afcaeae..fa5bfcb 100644 --- a/config/cmake/hdf5-config.cmake.in +++ b/config/cmake/hdf5-config.cmake.in @@ -44,6 +44,7 @@ set (${HDF5_PACKAGE_NAME}_ENABLE_PLUGIN_SUPPORT @HDF5_ENABLE_PLUGIN_SUPPORT@) set (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@) set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@) set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@) +set (${HDF5_PACKAGE_NAME}_ENABLE_ROS3_VFD @HDF5_ENABLE_ROS3_VFD@) set (${HDF5_PACKAGE_NAME}_ENABLE_SUBFILING_VFD @HDF5_ENABLE_SUBFILING_VFD@) set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS @H5_ENABLE_SHARED_LIB@) set (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS @H5_ENABLE_STATIC_LIB@) @@ -68,6 +69,11 @@ if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL) find_package(MPI QUIET REQUIRED) endif () +if (${HDF5_PACKAGE_NAME}_ENABLE_THREADSAFE OR ${HDF5_PACKAGE_NAME}_ENABLE_SUBFILING_VFD) + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads QUIET REQUIRED) +endif () + if (${HDF5_PACKAGE_NAME}_BUILD_JAVA) set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS @PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@HDF5_VERSION_STRING@.jar diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in index 00ae980..f60f0de 100644 --- a/config/cmake/libhdf5.settings.cmake.in +++ b/config/cmake/libhdf5.settings.cmake.in @@ -28,6 +28,7 @@ Linking Options: AM_LDFLAGS: @AM_LDFLAGS@ Extra libraries: @LINK_LIBS@ Archiver: @CMAKE_AR@ + AR_FLAGS: Ranlib: @CMAKE_RANLIB@ Languages: @@ -44,24 +45,24 @@ Languages: Static C Library: @H5_ENABLE_STATIC_LIB@ Fortran: @HDF5_BUILD_FORTRAN@ -@BUILD_FORTRAN_CONDITIONAL_TRUE@ Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@ -@BUILD_FORTRAN_CONDITIONAL_TRUE@ Fortran Flags: @CMAKE_Fortran_FLAGS@ -@BUILD_FORTRAN_CONDITIONAL_TRUE@ H5 Fortran Flags: @HDF5_CMAKE_Fortran_FLAGS@ -@BUILD_FORTRAN_CONDITIONAL_TRUE@ AM Fortran Flags: @AM_FCFLAGS@ -@BUILD_FORTRAN_CONDITIONAL_TRUE@ Shared Fortran Library: @H5_ENABLE_SHARED_LIB@ -@BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: @H5_ENABLE_STATIC_LIB@ -@BUILD_FORTRAN_CONDITIONAL_TRUE@ Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ + Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@ + Fortran Flags: @CMAKE_Fortran_FLAGS@ + H5 Fortran Flags: @HDF5_CMAKE_Fortran_FLAGS@ + AM Fortran Flags: @AM_FCFLAGS@ + Shared Fortran Library: @H5_ENABLE_SHARED_LIB@ + Static Fortran Library: @H5_ENABLE_STATIC_LIB@ + Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ C++: @HDF5_BUILD_CPP_LIB@ -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CMAKE_CXX_FLAGS@ -@BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ -@BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@ -@BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @H5_ENABLE_SHARED_LIB@ -@BUILD_CXX_CONDITIONAL_TRUE@ Static C++ Library: @H5_ENABLE_STATIC_LIB@ + C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ + C++ Flags: @CMAKE_CXX_FLAGS@ + H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ + AM C++ Flags: @AM_CXXFLAGS@ + Shared C++ Library: @H5_ENABLE_SHARED_LIB@ + Static C++ Library: @H5_ENABLE_STATIC_LIB@ - JAVA: @HDF5_BUILD_JAVA@ -@BUILD_JAVA_CONDITIONAL_TRUE@ JAVA Compiler: @CMAKE_Java_COMPILER@ @Java_VERSION@ + JAVA: @HDF5_BUILD_JAVA@ + JAVA Compiler: @CMAKE_Java_COMPILER@ @Java_VERSION@ Features: --------- @@ -77,6 +78,7 @@ Dimension scales w/ new references: @DIMENSION_SCALES_WITH_NEW_REF@ Default API mapping: @DEFAULT_API_VERSION@ With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@ I/O filters (external): @EXTERNAL_FILTERS@ + Map (H5M) API: @H5_HAVE_MAP_API@ Direct VFD: @H5_HAVE_DIRECT@ Mirror VFD: @H5_HAVE_MIRROR_VFD@ Subfiling VFD: @H5_HAVE_SUBFILING_VFD@ diff --git a/configure.ac b/configure.ac index 994b31a..a212825 100644 --- a/configure.ac +++ b/configure.ac @@ -3433,7 +3433,7 @@ esac ## ---------------------------------------------------------------------- ## 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 Power6 Linux. When the bit sequence of long double is +## the IBM Power Linux. When the bit sequence of long double is ## 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long ## is 0x004733ce17af227f, not the same as the library's conversion to 0x004733ce17af2282. ## The machine's conversion gets the correct value. We define the macro and disable @@ -3468,7 +3468,7 @@ fi ## ---------------------------------------------------------------------- ## Set the flag to indicate that the machine is using a special algorithm ## to convert some values of '(unsigned) long' to 'long double' values. -## (This flag should be off for all machines, except for IBM Power6 Linux, +## (This flag should be off for all machines, except for IBM Power Linux, ## when the bit sequences are 003fff..., 007fff..., 00ffff..., 01ffff..., ## ..., 7fffff..., the compiler uses a unknown algorithm. We define a ## macro and skip the test for now until we know about the algorithm. diff --git a/doc/release_txt_notes.md b/doc/release_txt_notes.md deleted file mode 100644 index 316ba3f..0000000 --- a/doc/release_txt_notes.md +++ /dev/null @@ -1,107 +0,0 @@ -# Writing Notes in a RELEASE.txt File - -## Introduction - -We have been challenged to write more helpful entries in our RELEASE.txt file -for new features, improvements, and bug fixes. To help users determine the -effects of our software changes on their applications, we have developed a -template that can be used to write release notes. The template is described on -the rest of this page. - -Some of our users face scrutiny from regulatory agencies for their use of -software they did not develop (aka SOUP). When they use our software, they have -to be aware of every change we make. For every change we make, they need to -investigate the effect the change will have on their software. If our change -affects their application, they may have to have their software retested or -re-certified. - -[SOUP](https://en.wikipedia.org/wiki/Software_of_unknown_pedigree) stands for Software Of Unknown/Uncertain Pedigree/Provenance - - -## When to write a RELEASE.txt note - -Generally, a release note must be written for every change that is made to the -code for which users might see a change in the way the software works. In other -words, if a user might see a difference in the way the software works, a note -should be written. By code we mean the text that will be compiled into one of -the company's software products. The code includes configuration changes and -changes to tools users might work with to configure and build our software. - -A release note does not need to be written for changes to the code that users -will not see. - -These things DO require a release note: - -* New features -* Changes in functionality/semantics -* Anything that changes functionality or symbols in a public header file -* Command-line tool option changes -* Adding or dropping support for compilers or operating systems -* Build system (Autotools, CMake) changes that users will encounter - -These things do NOT require a release note: - -* Internal comments -* Refactoring that does not change behavior or public headers (`H5XYpublic.h`) -* Minor build system changes (adding warning flags) - -Notes should also be added for known problems. Known problems are issues that -we know about and have not yet been able to fix. - -## RELEASE.txt entry format - -``` - - Title - - Problem - - Solution - - Signature -``` - -## RELEASE.txt entry elements - -### Title - -The title or tag should identify one or more categories that will help readers -decide if the entry is something they need to study. Categories include problem -areas, tool names, and code file names. Two examples are "Memory Leak" and -"h5repack". A code file such as H5R.c or H5Z.c can be used as the title if the -problem is located in the code file. If both a title and one or more tags are -used, separate each with a period. For example, "Changed Autotools Build Behavior. Fortran." -adds the Fortran tag to the title Changed Autotools Build Behavior. Use -standard capitalization rules. - -### Problem - -Describe the problem and how users might see the problem in a paragraph. - -You might also consider the following as you describe the problem: - -* Under what specific conditions does this issue arise? -* Under what specific conditions are we sure this issue will not arise? -* For a performance issue, instead of saying something is a performance issue, describe what the performance impact of issue is? - -### Solution - -Describe the solution in another paragraph. - -You might also consider the following as you describe the solution: - -* What was done to resolve the issue? -* What is the functional impact? -* Is there a workaround – a way for users design their software so as not to encounter the issue? If so, what is the workaround? -* For a performance fix, how has the performance improved? Links to published documentation would be good. - -### Signature - -Each entry must be signed with the initials of the author, the date in -YYYY/MM/DD format, and the JIRA ticket number. The signature is enclosed in -parentheses. - -Example: - -``` - (ABC - 2023/02/28, JIRA-12345, GitHub #1234) -``` diff --git a/doxygen/dox/IntroHDF5.dox b/doxygen/dox/IntroHDF5.dox index efdec17..3ca7d00 100644 --- a/doxygen/dox/IntroHDF5.dox +++ b/doxygen/dox/IntroHDF5.dox @@ -602,8 +602,8 @@ Navigate back: \ref index "Main" / \ref GettingStarted @page HDF5Examples HDF5 Examples Example programs of how to use HDF5 are provided below. For HDF-EOS specific examples, see the <a href="http://hdfeos.org/zoo/index.php">examples</a> -of how to access and visualize NASA HDF-EOS files using IDL, MATLAB, and NCL on the -<a href="http://hdfeos.org/">HDF-EOS Tools and Information Center</a> page. +of how to access and visualize NASA HDF-EOS files using Python, IDL, MATLAB, and NCL +on the <a href="http://hdfeos.org/">HDF-EOS Tools and Information Center</a> page. \section secHDF5Examples Examples \li \ref LBExamples diff --git a/doxygen/examples/H5Fclose.c b/doxygen/examples/H5Fclose.c index 525bad3..8c2ef08 100644 --- a/doxygen/examples/H5Fclose.c +++ b/doxygen/examples/H5Fclose.c @@ -1,7 +1,7 @@ #include "hdf5.h" int -main() +main(void) { hid_t file; if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) diff --git a/doxygen/examples/H5Fcreate.c b/doxygen/examples/H5Fcreate.c index 525bad3..8c2ef08 100644 --- a/doxygen/examples/H5Fcreate.c +++ b/doxygen/examples/H5Fcreate.c @@ -1,7 +1,7 @@ #include "hdf5.h" int -main() +main(void) { hid_t file; if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) diff --git a/doxygen/examples/hello_hdf5.c b/doxygen/examples/hello_hdf5.c index a37d39f..f078090 100644 --- a/doxygen/examples/hello_hdf5.c +++ b/doxygen/examples/hello_hdf5.c @@ -1,7 +1,7 @@ #include "hdf5.h" int -main() +main(void) { herr_t retval; unsigned majnum, minnum, relnum; diff --git a/doxygen/img/HDF5.png b/doxygen/img/HDF5.png Binary files differindex 0458fa8..46856f9 100644 --- a/doxygen/img/HDF5.png +++ b/doxygen/img/HDF5.png diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp index 1807be6..a77a8e1 100644 --- a/hl/c++/test/ptableTest.cpp +++ b/hl/c++/test/ptableTest.cpp @@ -81,7 +81,7 @@ BasicTest() int error; printf("Testing %-62s", "basic functionality"); - HDfflush(stdout); + fflush(stdout); FL_PacketTable wrapper(fileID, H5P_DEFAULT, BASICTEST_PT, H5T_NATIVE_INT, 1); if (!wrapper.IsValid()) @@ -139,7 +139,7 @@ TestCompoundDatatype() int error; printf("Testing %-62s", "compound datatypes"); - HDfflush(stdout); + fflush(stdout); /* Create compound datatype */ typedef struct { @@ -194,7 +194,7 @@ error: { H5Tclose(dtypeID); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -210,7 +210,7 @@ TestGetNext() int i; printf("Testing %-62s", "GetNextPacket"); - HDfflush(stdout); + fflush(stdout); /* Create a dataset */ FL_PacketTable wrapper(fileID, H5P_DEFAULT, GETNEXT_PT, H5T_NATIVE_INT, 500); @@ -277,7 +277,7 @@ TestCompress() size_t cd_nelemts = 0; printf("Testing %-62s", "compression"); - HDfflush(stdout); + fflush(stdout); try { /* Prepare property list to set compression, randomly use deflate */ DSetCreatPropList dscreatplist; @@ -326,7 +326,7 @@ TestGetPacket() int theRecs[3]; int i; printf("Testing %-62s", "GetPacket"); - HDfflush(stdout); + fflush(stdout); /* Create a dataset. Does not need to specify property list because there is no compression. */ @@ -365,7 +365,7 @@ int TestErrors() { printf("Testing %-62s", "error conditions"); - HDfflush(stdout); + fflush(stdout); /* Create a dataset */ FL_PacketTable wrapper(fileID, PT_TESTERROR, H5T_NATIVE_INT, 1); @@ -484,7 +484,7 @@ int SystemTest() { printf("Testing %-62s", "multiple datatypes"); - HDfflush(stdout); + fflush(stdout); hid_t dtypeID1, dtypeID2; hsize_t count; @@ -576,7 +576,7 @@ error: H5Tclose(dtypeID1); H5Tclose(dtypeID2); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -626,7 +626,7 @@ TestHDFFV_9758() } printf("Testing %-62s", "data corruption in packed structs (HDFFV-9758)"); - HDfflush(stdout); + fflush(stdout); // Build a compound datatype compound_type = H5Tcreate(H5T_COMPOUND, sizeof(s1_t)); @@ -685,7 +685,7 @@ TestHDFFV_9758() ptable.ResetIndex(); for (size_t i = 0; i < NUM_PACKETS; i++) { s1_t s2; - HDmemset(&s2, 0, sizeof(s1_t)); + memset(&s2, 0, sizeof(s1_t)); err = ptable.GetNextPacket(&s2); if (err < 0) goto error; @@ -708,7 +708,7 @@ error: H5Tclose(compound_type); H5Fclose(fileID); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; diff --git a/hl/examples/ex_image1.c b/hl/examples/ex_image1.c index d9080cb..49a9093 100644 --- a/hl/examples/ex_image1.c +++ b/hl/examples/ex_image1.c @@ -16,7 +16,7 @@ #define WIDTH 400 #define HEIGHT 200 #define PAL_ENTRIES 9 -unsigned char buf[WIDTH * HEIGHT]; +static unsigned char buf[WIDTH * HEIGHT]; int main(void) diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c index 579b126..9ce1746 100644 --- a/hl/examples/ex_image2.c +++ b/hl/examples/ex_image2.c @@ -22,8 +22,8 @@ #define PAL_NAME "palette" #define PAL_ENTRIES 256 -static int read_data(const char *file_name, hsize_t *width, hsize_t *height); -unsigned char *gbuf = NULL; /* global buffer for image data */ +static int read_data(const char *file_name, hsize_t *width, hsize_t *height); +static unsigned char *gbuf = NULL; /* global buffer for image data */ int main(void) diff --git a/release_docs/HISTORY-1_0-1_8_0.txt b/release_docs/HISTORY-1_0-1_8_0.txt index 333d0dc..6d9148d 100644 --- a/release_docs/HISTORY-1_0-1_8_0.txt +++ b/release_docs/HISTORY-1_0-1_8_0.txt @@ -8448,7 +8448,7 @@ C. Changes Since Version 1.0.1 ------------------- H5Tget_super - return the base datatype from which a datatype is derived - H5Tvlen_create - creates a new variable-length dataype + H5Tvlen_create - creates a new variable-length datatype H5Tenum_create - creates a new enumeration datatype H5Tenum_insert - inserts a new enumeration datatype member H5Tenum_nameof - returns the symbol name corresponding to a @@ -8944,7 +8944,7 @@ Datatypes H5Tset_strpad - set string padding + H5Tget_super - return the base datatype from which a datatype is derived - + H5Tvlen_create - creates a new variable-length dataype + + H5Tvlen_create - creates a new variable-length datatype + H5Tenum_create - creates a new enumeration datatype + H5Tenum_insert - inserts a new enumeration datatype member + H5Tenum_nameof - returns the symbol name corresponding to a diff --git a/release_docs/README_HPC b/release_docs/README_HPC index e3728a6..27dc32c 100644 --- a/release_docs/README_HPC +++ b/release_docs/README_HPC @@ -62,7 +62,7 @@ scripts on compute nodes and to cross-compile for compute node hardware using a cross-compiling emulator. The setup steps will make default settings for parallel or serial only builds available to the CMake command. - 1. The "hdf5" directory should be renamed hdf5-<version string>. For + 1. The "hdf5" directory should be renamed hdf5-<version string>. For further explanation see section II. 2. Three cmake script files need to be copied to the working directory, or diff --git a/src/H5system.c b/src/H5system.c index 9b40f44..a113acb 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -162,7 +162,7 @@ Pflock(int fd, int operation) flk.l_pid = 0; /* not used with set */ /* Lock or unlock */ - if (HDfcntl(fd, F_SETLK, &flk) < 0) + if (fcntl(fd, F_SETLK, &flk) < 0) return -1; return 0; @@ -948,11 +948,10 @@ char * Wstrcasestr_wrap(const char *haystack, const char *needle) { if (needle && !*needle) - return haystack; + return (char *)haystack; else return StrStrIA(haystack, needle); } - #endif /* H5_HAVE_WIN32_API */ /* dirname() and basename() are not easily ported to Windows and basename @@ -1260,7 +1259,7 @@ H5_get_option(int argc, const char *const *argv, const char *opts, const struct } } - if (l_opts[i].name == NULL) { + if (l_opts && l_opts[i].name == NULL) { /* exhausted all of the l_opts we have and still didn't match */ if (H5_opterr) fprintf(stderr, "%s: unknown option \"%s\"\n", argv[0], arg); diff --git a/test/API/H5_api_async_test.c b/test/API/H5_api_async_test.c index 4afea50..89b231f 100644 --- a/test/API/H5_api_async_test.c +++ b/test/API/H5_api_async_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_async_test.h b/test/API/H5_api_async_test.h index f6df48a..718e217 100644 --- a/test/API/H5_api_async_test.h +++ b/test/API/H5_api_async_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_attribute_test.c b/test/API/H5_api_attribute_test.c index 144b0a4..5c8efe9 100644 --- a/test/API/H5_api_attribute_test.c +++ b/test/API/H5_api_attribute_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_attribute_test.h b/test/API/H5_api_attribute_test.h index 7656263..dd83e73 100644 --- a/test/API/H5_api_attribute_test.h +++ b/test/API/H5_api_attribute_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_dataset_test.c b/test/API/H5_api_dataset_test.c index d99516f..9c7e5dc 100644 --- a/test/API/H5_api_dataset_test.c +++ b/test/API/H5_api_dataset_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_dataset_test.h b/test/API/H5_api_dataset_test.h index 5f692b8..5d18c4d 100644 --- a/test/API/H5_api_dataset_test.h +++ b/test/API/H5_api_dataset_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_datatype_test.c b/test/API/H5_api_datatype_test.c index 7a67210..c1af758 100644 --- a/test/API/H5_api_datatype_test.c +++ b/test/API/H5_api_datatype_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_datatype_test.h b/test/API/H5_api_datatype_test.h index 753f9b2..2088ef1 100644 --- a/test/API/H5_api_datatype_test.h +++ b/test/API/H5_api_datatype_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_file_test.c b/test/API/H5_api_file_test.c index d3d686c..1455f64 100644 --- a/test/API/H5_api_file_test.c +++ b/test/API/H5_api_file_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_file_test.h b/test/API/H5_api_file_test.h index 948cb6a..368d037 100644 --- a/test/API/H5_api_file_test.h +++ b/test/API/H5_api_file_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_group_test.c b/test/API/H5_api_group_test.c index 20ced5b..d3093bb 100644 --- a/test/API/H5_api_group_test.c +++ b/test/API/H5_api_group_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_group_test.h b/test/API/H5_api_group_test.h index baf14c8..b1cbc68 100644 --- a/test/API/H5_api_group_test.h +++ b/test/API/H5_api_group_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_link_test.c b/test/API/H5_api_link_test.c index 3abd602..901ff96 100644 --- a/test/API/H5_api_link_test.c +++ b/test/API/H5_api_link_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_link_test.h b/test/API/H5_api_link_test.h index e161517..c068f4f 100644 --- a/test/API/H5_api_link_test.h +++ b/test/API/H5_api_link_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_misc_test.c b/test/API/H5_api_misc_test.c index 37b98ab..4e32f97 100644 --- a/test/API/H5_api_misc_test.c +++ b/test/API/H5_api_misc_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_misc_test.h b/test/API/H5_api_misc_test.h index 8729db7..99fe4b5 100644 --- a/test/API/H5_api_misc_test.h +++ b/test/API/H5_api_misc_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_object_test.c b/test/API/H5_api_object_test.c index 268e65c..a809d0e 100644 --- a/test/API/H5_api_object_test.c +++ b/test/API/H5_api_object_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_object_test.h b/test/API/H5_api_object_test.h index 5470843..75c3961 100644 --- a/test/API/H5_api_object_test.h +++ b/test/API/H5_api_object_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_test.c b/test/API/H5_api_test.c index 6c91721..3685506 100644 --- a/test/API/H5_api_test.c +++ b/test/API/H5_api_test.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_test.h b/test/API/H5_api_test.h index 2b23750..c6094bd 100644 --- a/test/API/H5_api_test.h +++ b/test/API/H5_api_test.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_test_config.h.in b/test/API/H5_api_test_config.h.in index c1833fa..59fbf6a 100644 --- a/test/API/H5_api_test_config.h.in +++ b/test/API/H5_api_test_config.h.in @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_test_util.c b/test/API/H5_api_test_util.c index d7d330f..9e9cc6a 100644 --- a/test/API/H5_api_test_util.c +++ b/test/API/H5_api_test_util.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/H5_api_test_util.h b/test/API/H5_api_test_util.h index 86b0e3e..5d127bb 100644 --- a/test/API/H5_api_test_util.h +++ b/test/API/H5_api_test_util.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/test/API/driver/h5_api_test_driver.cxx b/test/API/driver/h5_api_test_driver.cxx index b5d9821..1948ff7 100644 --- a/test/API/driver/h5_api_test_driver.cxx +++ b/test/API/driver/h5_api_test_driver.cxx @@ -1,3 +1,15 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * All rights reserved. * + * * + * 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://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include "h5_api_test_driver.hxx" #include "H5_api_test_config.h" diff --git a/test/API/driver/h5_api_test_driver.hxx b/test/API/driver/h5_api_test_driver.hxx index b8e05e7..9e69dd7 100644 --- a/test/API/driver/h5_api_test_driver.hxx +++ b/test/API/driver/h5_api_test_driver.hxx @@ -1,3 +1,15 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * All rights reserved. * + * * + * 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://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #ifndef H5_API_TEST_DRIVER_H #define H5_API_TEST_DRIVER_H diff --git a/test/tskiplist.c b/test/tskiplist.c index 4962541..e94e3c0 100644 --- a/test/tskiplist.c +++ b/test/tskiplist.c @@ -95,13 +95,13 @@ test_skiplist_init(void) memcpy(sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); /* Sort random numbers */ - HDqsort(sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_sort); + qsort(sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_sort); /* Copy random values to reverse sorted array */ memcpy(rev_sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); /* Sort random numbers */ - HDqsort(rev_sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_rev_sort); + qsort(rev_sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_rev_sort); } /* end test_skiplist_init() */ /**************************************************************** diff --git a/testpar/API/H5_api_async_test_parallel.c b/testpar/API/H5_api_async_test_parallel.c index d6f55b1..06cbd08 100644 --- a/testpar/API/H5_api_async_test_parallel.c +++ b/testpar/API/H5_api_async_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_async_test_parallel.h b/testpar/API/H5_api_async_test_parallel.h index 9e4340c..b99a328 100644 --- a/testpar/API/H5_api_async_test_parallel.h +++ b/testpar/API/H5_api_async_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_attribute_test_parallel.c b/testpar/API/H5_api_attribute_test_parallel.c index a941b9a..163f8a1 100644 --- a/testpar/API/H5_api_attribute_test_parallel.c +++ b/testpar/API/H5_api_attribute_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_attribute_test_parallel.h b/testpar/API/H5_api_attribute_test_parallel.h index 81802ae..3deb279 100644 --- a/testpar/API/H5_api_attribute_test_parallel.h +++ b/testpar/API/H5_api_attribute_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_dataset_test_parallel.c b/testpar/API/H5_api_dataset_test_parallel.c index 6f9bf05..c2f5b93 100644 --- a/testpar/API/H5_api_dataset_test_parallel.c +++ b/testpar/API/H5_api_dataset_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_dataset_test_parallel.h b/testpar/API/H5_api_dataset_test_parallel.h index 1e2cbd0..8f7aadb 100644 --- a/testpar/API/H5_api_dataset_test_parallel.h +++ b/testpar/API/H5_api_dataset_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_datatype_test_parallel.c b/testpar/API/H5_api_datatype_test_parallel.c index 3d00ad9..f60893e 100644 --- a/testpar/API/H5_api_datatype_test_parallel.c +++ b/testpar/API/H5_api_datatype_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_datatype_test_parallel.h b/testpar/API/H5_api_datatype_test_parallel.h index 0a2ba50..85c7099 100644 --- a/testpar/API/H5_api_datatype_test_parallel.h +++ b/testpar/API/H5_api_datatype_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_file_test_parallel.c b/testpar/API/H5_api_file_test_parallel.c index 7a78619..5e4e42e 100644 --- a/testpar/API/H5_api_file_test_parallel.c +++ b/testpar/API/H5_api_file_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_file_test_parallel.h b/testpar/API/H5_api_file_test_parallel.h index aac9800..380a2ff 100644 --- a/testpar/API/H5_api_file_test_parallel.h +++ b/testpar/API/H5_api_file_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_group_test_parallel.c b/testpar/API/H5_api_group_test_parallel.c index b894b74..1c761c4 100644 --- a/testpar/API/H5_api_group_test_parallel.c +++ b/testpar/API/H5_api_group_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_group_test_parallel.h b/testpar/API/H5_api_group_test_parallel.h index 87dd24f..a2a2857 100644 --- a/testpar/API/H5_api_group_test_parallel.h +++ b/testpar/API/H5_api_group_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_link_test_parallel.c b/testpar/API/H5_api_link_test_parallel.c index f9999bd..739e815 100644 --- a/testpar/API/H5_api_link_test_parallel.c +++ b/testpar/API/H5_api_link_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_link_test_parallel.h b/testpar/API/H5_api_link_test_parallel.h index dbf0fc7..8679ccb 100644 --- a/testpar/API/H5_api_link_test_parallel.h +++ b/testpar/API/H5_api_link_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_misc_test_parallel.c b/testpar/API/H5_api_misc_test_parallel.c index 307b3a0..3453f8a 100644 --- a/testpar/API/H5_api_misc_test_parallel.c +++ b/testpar/API/H5_api_misc_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_misc_test_parallel.h b/testpar/API/H5_api_misc_test_parallel.h index 84553a9..321fb6b 100644 --- a/testpar/API/H5_api_misc_test_parallel.h +++ b/testpar/API/H5_api_misc_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_object_test_parallel.c b/testpar/API/H5_api_object_test_parallel.c index d08de7f..5870058 100644 --- a/testpar/API/H5_api_object_test_parallel.c +++ b/testpar/API/H5_api_object_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_object_test_parallel.h b/testpar/API/H5_api_object_test_parallel.h index 6a8569f..39bade9 100644 --- a/testpar/API/H5_api_object_test_parallel.h +++ b/testpar/API/H5_api_object_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_test_parallel.c b/testpar/API/H5_api_test_parallel.c index a7f2839..fb80d8a 100644 --- a/testpar/API/H5_api_test_parallel.c +++ b/testpar/API/H5_api_test_parallel.c @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/testpar/API/H5_api_test_parallel.h b/testpar/API/H5_api_test_parallel.h index 6df83e8..44f9440 100644 --- a/testpar/API/H5_api_test_parallel.h +++ b/testpar/API/H5_api_test_parallel.h @@ -5,7 +5,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. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -162,15 +162,15 @@ extern char H5_api_test_parallel_filename[]; MPI_LOR, MPI_COMM_WORLD)) \ { \ if (MAINPROCESS) \ - HDprintf( \ + printf( \ " failed to collect consensus about whether non-collective operation was successful\n"); \ goto error; \ } \ \ if (ind_op_failed) { \ if (MAINPROCESS) \ - HDprintf(" failure detected during non-collective operation - all other ranks will now fail " \ - "too\n"); \ + printf(" failure detected during non-collective operation - all other ranks will now fail " \ + "too\n"); \ goto error; \ } \ } diff --git a/testpar/API/t_bigio.c b/testpar/API/t_bigio.c index 0184c3a..f1d7a97 100644 --- a/testpar/API/t_bigio.c +++ b/testpar/API/t_bigio.c @@ -1,3 +1,14 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * All rights reserved. * + * * + * 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://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "hdf5.h" #include "testphdf5.h" @@ -1850,7 +1861,7 @@ main(int argc, char **argv) /* Attempt to turn off atexit post processing so that in case errors * happen during the test and the process is aborted, it will not get - * hang in the atexit post processing in which it may try to make MPI + * hung in the atexit post processing in which it may try to make MPI * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0) diff --git a/testpar/API/t_shapesame.c b/testpar/API/t_shapesame.c index 621c336..9d48827 100644 --- a/testpar/API/t_shapesame.c +++ b/testpar/API/t_shapesame.c @@ -3962,7 +3962,7 @@ void *old_client_data; /* previous error handler arg.*/ #ifdef USE_PAUSE /* pause the process for a moment to allow debugger to attach if desired. */ -/* Will pause more if greenlight file is not persent but will eventually */ +/* Will pause more if greenlight file is not present but will eventually */ /* continue. */ #include <sys/types.h> #include <sys/stat.h> @@ -4301,7 +4301,7 @@ main(int argc, char **argv) /* Attempt to turn off atexit post processing so that in case errors * happen during the test and the process is aborted, it will not get - * hang in the atexit post processing in which it may try to make MPI + * hung in the atexit post processing in which it may try to make MPI * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0) { diff --git a/testpar/API/testphdf5.c b/testpar/API/testphdf5.c index 9469c12..a341112 100644 --- a/testpar/API/testphdf5.c +++ b/testpar/API/testphdf5.c @@ -51,7 +51,7 @@ hid_t fapl; /* file access property list */ #ifdef USE_PAUSE /* pause the process for a moment to allow debugger to attach if desired. */ -/* Will pause more if greenlight file is not persent but will eventually */ +/* Will pause more if greenlight file is not present but will eventually */ /* continue. */ #include <sys/types.h> #include <sys/stat.h> @@ -341,7 +341,7 @@ main(int argc, char **argv) /* Attempt to turn off atexit post processing so that in case errors * happen during the test and the process is aborted, it will not get - * hang in the atexit post processing in which it may try to make MPI + * hung in the atexit post processing in which it may try to make MPI * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0) { diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c index 0c4d125..3a28022 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -1870,7 +1870,7 @@ main(int argc, char **argv) /* Attempt to turn off atexit post processing so that in case errors * happen during the test and the process is aborted, it will not get - * hang in the atexit post processing in which it may try to make MPI + * hung in the atexit post processing in which it may try to make MPI * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0) diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 3ba4c79..0d18851 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -2233,13 +2233,11 @@ datum_serialize(const H5F_t *f, void H5_ATTR_NDEBUG_UNUSED *image_ptr, size_t le assert(f); assert(f->shared); assert(f->shared->cache); - assert(f->shared->cache->magic == H5C__H5C_T_MAGIC); assert(f->shared->cache->aux_ptr); aux_ptr = (H5AC_aux_t *)(f->shared->cache->aux_ptr); assert(aux_ptr); - assert(aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC); entry_ptr->aux_ptr = aux_ptr; @@ -2463,7 +2461,6 @@ datum_notify(H5C_notify_action_t action, void *thing) } assert(entry_ptr->aux_ptr); - assert(entry_ptr->aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC); aux_ptr = entry_ptr->aux_ptr; entry_ptr->aux_ptr = NULL; @@ -2826,8 +2823,7 @@ insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags) aux_ptr = ((H5AC_aux_t *)(cache_ptr->aux_ptr)); - if (!((aux_ptr != NULL) && (aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC) && - (aux_ptr->dirty_bytes == 0))) { + if (!(aux_ptr != NULL && aux_ptr->dirty_bytes == 0)) { nerrors++; if (verbose) { @@ -3420,8 +3416,7 @@ move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx) aux_ptr = ((H5AC_aux_t *)(file_ptr->shared->cache->aux_ptr)); - if (!((aux_ptr != NULL) && (aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC) && - (aux_ptr->dirty_bytes == 0))) { + if (!(aux_ptr != NULL && aux_ptr->dirty_bytes == 0)) { nerrors++; if (verbose) { @@ -3638,12 +3633,6 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr fprintf(stdout, "%d:%s: Can't get cache_ptr.\n", world_mpi_rank, __func__); } } - else if (cache_ptr->magic != H5C__H5C_T_MAGIC) { - nerrors++; - if (verbose) { - fprintf(stdout, "%d:%s: Bad cache_ptr magic.\n", world_mpi_rank, __func__); - } - } else { cache_ptr->ignore_tags = TRUE; *fid_ptr = fid; @@ -3693,14 +3682,6 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr fprintf(stdout, "%d:%s: cache_ptr->aux_ptr == NULL.\n", world_mpi_rank, __func__); } } - else if (((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic != H5AC__H5AC_AUX_T_MAGIC) { - - nerrors++; - if (verbose) { - fprintf(stdout, "%d:%s: cache_ptr->aux_ptr->magic != H5AC__H5AC_AUX_T_MAGIC.\n", - world_mpi_rank, __func__); - } - } else if (((H5AC_aux_t *)(cache_ptr->aux_ptr))->metadata_write_strategy != metadata_write_strategy) { nerrors++; @@ -6386,7 +6367,7 @@ trace_file_check(int metadata_write_strategy) /* Clean up the trace file */ if (trace_file_ptr != NULL) { - HDfclose(trace_file_ptr); + fclose(trace_file_ptr); trace_file_ptr = NULL; HDremove(trace_file_name); } @@ -6695,7 +6676,7 @@ main(int argc, char **argv) /* Attempt to turn off atexit post processing so that in case errors * happen during the test and the process is aborted, it will not get - * hang in the atexit post processing in which it may try to make MPI + * hung in the atexit post processing in which it may try to make MPI * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0) diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index 028752d..8ce5662 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -3523,7 +3523,7 @@ main(int argc, char **argv) /* Attempt to turn off atexit post processing so that in case errors * happen during the test and the process is aborted, it will not get - * hang in the atexit post processing in which it may try to make MPI + * hung in the atexit post processing in which it may try to make MPI * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0) diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c index 5dd0bb8..fd77988 100644 --- a/testpar/t_coll_chunk.c +++ b/testpar/t_coll_chunk.c @@ -858,7 +858,7 @@ coll_chunktest(const char *filename, int chunk_factor, int select_factor, int ap VRFY((acc_plist >= 0), "MPIO creation property list succeeded"); file = H5Fopen(filename, H5F_ACC_RDONLY, acc_plist); - VRFY((file >= 0), "H5Fcreate succeeded"); + VRFY((file >= 0), "H5Fopen succeeded"); status = H5Pclose(acc_plist); VRFY((status >= 0), ""); diff --git a/testpar/t_file.c b/testpar/t_file.c index 7568ba0..69d0562 100644 --- a/testpar/t_file.c +++ b/testpar/t_file.c @@ -156,7 +156,7 @@ test_page_buffer_access(void) { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); } - H5E_END_TRY; + H5E_END_TRY VRFY((file_id < 0), "H5Fcreate failed"); /* disable collective metadata writes for page buffering to work */ @@ -467,7 +467,6 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str VRFY((f != NULL), ""); cache_ptr = f->shared->cache; - VRFY((cache_ptr->magic == H5C__H5C_T_MAGIC), ""); cache_ptr->ignore_tags = TRUE; H5C_stats__reset(cache_ptr); @@ -634,7 +633,6 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t VRFY((f != NULL), ""); cache_ptr = f->shared->cache; - VRFY((cache_ptr->magic == H5C__H5C_T_MAGIC), ""); MPI_Barrier(MPI_COMM_WORLD); @@ -713,7 +711,6 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t entry_ptr = cache_ptr->index[i]; while (entry_ptr != NULL) { - assert(entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC); assert(entry_ptr->is_dirty == FALSE); if (!entry_ptr->is_pinned && !entry_ptr->is_protected) { @@ -995,7 +992,7 @@ test_delete(void) { is_hdf5 = H5Fis_accessible(filename, fapl_id); } - H5E_END_TRY; + H5E_END_TRY VRFY((is_hdf5 != SUCCEED), "H5Fis_accessible"); /* Release file-access plist */ diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c index 27b0980..bfe306c 100644 --- a/testpar/t_filters_parallel.c +++ b/testpar/t_filters_parallel.c @@ -18,8 +18,8 @@ #include "t_filters_parallel.h" -const char *FILENAME[] = {"t_filters_parallel", NULL}; -char filenames[1][256]; +static const char *FILENAME[] = {"t_filters_parallel", NULL}; +char filenames[1][256]; static MPI_Comm comm = MPI_COMM_WORLD; static MPI_Info info = MPI_INFO_NULL; @@ -3420,7 +3420,7 @@ test_write_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_gro { VRFY((H5Dwrite(dset_id, memtype, memspace, filespace, dxpl_id, data) < 0), "Dataset write succeeded"); } - H5E_END_TRY; + H5E_END_TRY /* Verify space allocation status */ verify_space_alloc_status(dset_id, plist_id, NO_CHUNKS_WRITTEN); @@ -3617,7 +3617,7 @@ test_write_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group { VRFY((H5Dwrite(dset_id, memtype, memspace, filespace, dxpl_id, data) < 0), "Dataset write succeeded"); } - H5E_END_TRY; + H5E_END_TRY /* Verify space allocation status */ verify_space_alloc_status(dset_id, plist_id, NO_CHUNKS_WRITTEN); @@ -8213,7 +8213,7 @@ test_fill_value_undefined(const char *parent_group, H5Z_filter_t filter_id, hid_ VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) < 0), "Dataset read succeeded"); } - H5E_END_TRY; + H5E_END_TRY } /* diff --git a/testpar/t_init_term.c b/testpar/t_init_term.c index a01b693..929bb59 100644 --- a/testpar/t_init_term.c +++ b/testpar/t_init_term.c @@ -19,7 +19,7 @@ int nerrors = 0; /* errors count */ -const char *FILENAME[] = {"after_mpi_fin", NULL}; +static const char *FILENAME[] = {"after_mpi_fin", NULL}; int main(int argc, char **argv) diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index 48d0cc1..70a76ec 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -455,7 +455,7 @@ test_mpio_1wMr(char *filename, int special_request) /* show the hostname so that we can tell where the processes are running */ if (VERBOSE_DEF) { #ifdef H5_HAVE_GETHOSTNAME - if (HDgethostname(hostname, sizeof(hostname)) < 0) { + if (gethostname(hostname, sizeof(hostname)) < 0) { printf("gethostname failed\n"); hostname[0] = '\0'; } diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c index bfebbb9..7d8d7fa 100644 --- a/testpar/t_pflush1.c +++ b/testpar/t_pflush1.c @@ -19,7 +19,7 @@ */ #include "h5test.h" -const char *FILENAME[] = {"flush", "noflush", NULL}; +static const char *FILENAME[] = {"flush", "noflush", NULL}; static int *data_g = NULL; diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c index 68f756d..81ed2bd 100644 --- a/testpar/t_pflush2.c +++ b/testpar/t_pflush2.c @@ -20,7 +20,7 @@ #include "h5test.h" -const char *FILENAME[] = {"flush", "noflush", NULL}; +static const char *FILENAME[] = {"flush", "noflush", NULL}; static int *data_g = NULL; @@ -112,7 +112,7 @@ error: H5Sclose(sid); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end check_test_file() */ diff --git a/testpar/t_prestart.c b/testpar/t_prestart.c index d69f17b..4fd7b5a 100644 --- a/testpar/t_prestart.c +++ b/testpar/t_prestart.c @@ -19,7 +19,7 @@ int nerrors = 0; /* errors count */ -const char *FILENAME[] = {"shutdown", NULL}; +static const char *FILENAME[] = {"shutdown", NULL}; int main(int argc, char **argv) diff --git a/testpar/t_pshutdown.c b/testpar/t_pshutdown.c index 9a2e0a3..b0b5da7 100644 --- a/testpar/t_pshutdown.c +++ b/testpar/t_pshutdown.c @@ -23,7 +23,7 @@ int nerrors = 0; /* errors count */ -const char *FILENAME[] = {"shutdown", NULL}; +static const char *FILENAME[] = {"shutdown", NULL}; int main(int argc, char **argv) diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index dc60e51..d9cd20c 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -3941,7 +3941,7 @@ hid_t fapl; /* file access property list */ #ifdef USE_PAUSE /* pause the process for a moment to allow debugger to attach if desired. */ -/* Will pause more if greenlight file is not persent but will eventually */ +/* Will pause more if greenlight file is not present but will eventually */ /* continue. */ #include <sys/types.h> #include <sys/stat.h> @@ -4272,7 +4272,7 @@ main(int argc, char **argv) /* Attempt to turn off atexit post processing so that in case errors * happen during the test and the process is aborted, it will not get - * hang in the atexit post processing in which it may try to make MPI + * hung in the atexit post processing in which it may try to make MPI * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0) { diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c index 6e6329c..827faf4 100644 --- a/testpar/t_vfd.c +++ b/testpar/t_vfd.c @@ -4086,7 +4086,7 @@ main(int argc, char **argv) int provided = 0; #endif int mpi_size; - int mpi_rank; + int mpi_rank = 0; #ifdef H5_HAVE_SUBFILING_VFD if (MPI_SUCCESS != MPI_Init_thread(&argc, &argv, required, &provided)) { diff --git a/testpar/testpar.h b/testpar/testpar.h index 58bcab4..ca0f608 100644 --- a/testpar/testpar.h +++ b/testpar/testpar.h @@ -32,7 +32,7 @@ #define MESG(mesg) \ do { \ if (VERBOSE_MED && *mesg != '\0') { \ - HDprintf("%s\n", mesg); \ + printf("%s\n", mesg); \ } \ } while (0) @@ -52,13 +52,13 @@ MESG(mesg); \ } \ else { \ - HDprintf("Proc %d: ", rankvar); \ - HDprintf("*** Parallel ERROR ***\n"); \ - HDprintf(" VRFY (%s) failed at line %4d in %s\n", mesg, (int)__LINE__, __FILE__); \ + printf("Proc %d: ", rankvar); \ + printf("*** Parallel ERROR ***\n"); \ + printf(" VRFY (%s) failed at line %4d in %s\n", mesg, (int)__LINE__, __FILE__); \ ++nerrors; \ fflush(stdout); \ if (!VERBOSE_MED) { \ - HDprintf("aborting MPI processes\n"); \ + printf("aborting MPI processes\n"); \ MPI_Abort(MPI_COMM_WORLD, 1); \ } \ } \ @@ -78,9 +78,9 @@ MESG(mesg); \ } \ else { \ - HDprintf("Proc %d: ", mpi_rank); \ - HDprintf("*** PHDF5 REMARK (not an error) ***\n"); \ - HDprintf(" Condition (%s) failed at line %4d in %s\n", mesg, (int)__LINE__, __FILE__); \ + printf("Proc %d: ", mpi_rank); \ + printf("*** PHDF5 REMARK (not an error) ***\n"); \ + printf(" Condition (%s) failed at line %4d in %s\n", mesg, (int)__LINE__, __FILE__); \ fflush(stdout); \ } \ } while (0) @@ -88,10 +88,10 @@ #define MPI_BANNER(mesg) \ do { \ if (VERBOSE_MED || MAINPROCESS) { \ - HDprintf("--------------------------------\n"); \ - HDprintf("Proc %d: ", mpi_rank); \ - HDprintf("*** %s\n", mesg); \ - HDprintf("--------------------------------\n"); \ + printf("--------------------------------\n"); \ + printf("Proc %d: ", mpi_rank); \ + printf("*** %s\n", mesg); \ + printf("--------------------------------\n"); \ } \ } while (0) diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index b35a758..a389d0c 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -47,7 +47,7 @@ hid_t fapl; /* file access property list */ #ifdef USE_PAUSE /* pause the process for a moment to allow debugger to attach if desired. */ -/* Will pause more if greenlight file is not persent but will eventually */ +/* Will pause more if greenlight file is not present but will eventually */ /* continue. */ #include <sys/types.h> #include <sys/stat.h> @@ -256,7 +256,7 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type) MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); ret_pl = H5Pcreate(H5P_FILE_ACCESS); - VRFY((ret_pl >= 0), "H5P_FILE_ACCESS"); + VRFY((ret_pl >= 0), "H5Pcreate succeeded"); if (l_facc_type == FACC_DEFAULT) return (ret_pl); @@ -264,11 +264,11 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type) if (l_facc_type == FACC_MPIO) { /* set Parallel access with communicator */ ret = H5Pset_fapl_mpio(ret_pl, comm, info); - VRFY((ret >= 0), ""); + VRFY((ret >= 0), "H5Pset_fapl_mpio succeeded"); ret = H5Pset_all_coll_metadata_ops(ret_pl, TRUE); - VRFY((ret >= 0), ""); + VRFY((ret >= 0), "H5Pset_all_coll_metadata_ops succeeded"); ret = H5Pset_coll_metadata_write(ret_pl, TRUE); - VRFY((ret >= 0), ""); + VRFY((ret >= 0), "H5Pset_coll_metadata_write succeeded"); return (ret_pl); } @@ -276,14 +276,14 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type) hid_t mpio_pl; mpio_pl = H5Pcreate(H5P_FILE_ACCESS); - VRFY((mpio_pl >= 0), ""); + VRFY((mpio_pl >= 0), "H5Pcreate succeeded"); /* set Parallel access with communicator */ ret = H5Pset_fapl_mpio(mpio_pl, comm, info); - VRFY((ret >= 0), ""); + VRFY((ret >= 0), "H5Pset_fapl_mpio succeeded"); /* setup file access template */ ret_pl = H5Pcreate(H5P_FILE_ACCESS); - VRFY((ret_pl >= 0), ""); + VRFY((ret_pl >= 0), "H5Pcreate succeeded"); /* set Parallel access with communicator */ ret = H5Pset_fapl_split(ret_pl, ".meta", mpio_pl, ".raw", mpio_pl); VRFY((ret >= 0), "H5Pset_fapl_split succeeded"); @@ -325,7 +325,7 @@ main(int argc, char **argv) /* Attempt to turn off atexit post processing so that in case errors * happen during the test and the process is aborted, it will not get - * hang in the atexit post processing in which it may try to make MPI + * hung in the atexit post processing in which it may try to make MPI * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0) { diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c index a907e39..15d8b4f 100644 --- a/tools/lib/io_timer.c +++ b/tools/lib/io_timer.c @@ -33,7 +33,7 @@ #define MICROSECOND 1000000.0F /* global variables */ -io_time_t *timer_g; /* timer: global for stub functions */ +static io_time_t *timer_g; /* timer: global for stub functions */ /* * Function: sub_time diff --git a/tools/test/h5copy/dynlib_copy.c b/tools/test/h5copy/dynlib_copy.c index e71ca47..2abef79 100644 --- a/tools/test/h5copy/dynlib_copy.c +++ b/tools/test/h5copy/dynlib_copy.c @@ -24,7 +24,7 @@ static size_t H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const un size_t nbytes, size_t *buf_size, void **buf); /* This message derives from H5Z */ -const H5Z_class2_t H5Z_DYNLIBUD[1] = {{ +static const H5Z_class2_t H5Z_DYNLIBUD[1] = {{ H5Z_CLASS_T_VERS, /* H5Z_class_t version */ H5Z_FILTER_DYNLIBUD, /* Filter id number */ 1, 1, /* Encoding and decoding enabled */ diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c index 6138fcd..256ac45 100644 --- a/utils/tools/h5dwalk/h5dwalk.c +++ b/utils/tools/h5dwalk/h5dwalk.c @@ -299,8 +299,8 @@ distribute_separator_add(struct distribute_option *option, uint64_t separator) pos = low; if (pos < count) - HDmemmove(&option->separators[low + 1], &option->separators[low], - sizeof(*option->separators) * (uint64_t)(count - pos)); + memmove(&option->separators[low + 1], &option->separators[low], + sizeof(*option->separators) * (uint64_t)(count - pos)); option->separators[pos] = separator; return 0; @@ -774,7 +774,7 @@ fill_file_list(mfu_flist new_flist, const char *config_filename, int myrank, int } linebuf[0] = 0; } - HDfclose(config); + fclose(config); return index; } @@ -1317,7 +1317,7 @@ process_input_file(char *inputname, int myrank, int size) if (output_log_file) { dh5tool_flist_write_text(output_log_file, flist1); } - HDfclose(config); + fclose(config); mfu_flist_free(&flist1); return 0; |
