summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.clang-format31
-rw-r--r--.github/workflows/clang-format-check.yml2
-rw-r--r--.github/workflows/main.yml86
-rw-r--r--.github/workflows/pr-check.yml87
-rw-r--r--c++/src/H5PredType.h2
-rw-r--r--doxygen/examples/H5Fclose.c17
-rw-r--r--doxygen/examples/H5Fcreate.c17
-rw-r--r--doxygen/examples/hello_hdf5.c15
-rw-r--r--java/src/jni/h5sImp.c4
-rw-r--r--src/H5Fprivate.h10
-rw-r--r--src/H5Fsuper.c12
-rw-r--r--src/H5Oprivate.h2
-rw-r--r--src/H5Spkg.h6
-rw-r--r--src/H5Spoint.c16
-rw-r--r--src/H5Tpublic.h2
-rw-r--r--src/H5Zpublic.h12
-rw-r--r--src/H5public.h10
-rw-r--r--test/fheap.c2
-rw-r--r--testpar/t_dset.c6
19 files changed, 264 insertions, 75 deletions
diff --git a/.clang-format b/.clang-format
index 4779a35..34b7563 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,14 +1,33 @@
---
Language: Cpp
BasedOnStyle: LLVM
-AlignConsecutiveMacros: true
AlignConsecutiveAssignments: true
+#llvm11: AlignConsecutiveBitFields: false
AlignConsecutiveDeclarations: true
+AlignConsecutiveMacros: true
+#llvm10-11: AlignOperands: true - Align
+#llvm11: AllowShortEnumsOnASingleLine: true
AlwaysBreakAfterReturnType: AllDefinitions
+# Can enable the following section when llvm 12.x is out
+#AttributeMacros:
+# - H5_ATTR_FORMAT
+# - H5_ATTR_UNUSED
+# - H5_ATTR_DEPRECATED_USED
+# - H5_ATTR_NDEBUG_UNUSED
+# - H5_ATTR_DEBUG_API_USED
+# - H5_ATTR_PARALLEL_UNUSED
+# - H5_ATTR_PARALLEL_USED
+# - H5_ATTR_NORETURN
+# - H5_ATTR_CONST
+# - H5_ATTR_PURE
+# - H5_ATTR_FALLTHROUGH
BraceWrapping:
AfterFunction: true
+ #llvm10-11: AfterControlStatement: false - Never
BeforeCatch: true
BeforeElse: true
+ #llvm11: BeforeLambdaBody: false
+ #llvm11: BeforeWhile: false
BreakBeforeBraces: Stroustrup
BreakAfterJavaFieldAnnotations: true
BreakStringLiterals: true
@@ -31,11 +50,15 @@ IncludeCategories:
SortPriority: 0
IncludeIsMainRegex: '(public)?$'
IndentCaseLabels: true
+#llvm11: IndentCaseBlocks: false
IndentGotoLabels: false
+#llvm11: IndentExternBlock: AfterExternBlock
IndentWidth: 4
+#llvm11: InsertTrailingCommas: None
MacroBlockBegin: "^BEGIN_FUNC"
MacroBlockEnd: "^END_FUNC"
ObjCBlockIndentWidth: 4
+#llvm11: ObjCBreakBeforeNestedBlockParam: true
ReflowComments: true
SortIncludes: false
StatementMacros:
@@ -61,5 +84,11 @@ StatementMacros:
- H5_GCC_DIAG_OFF
- H5_GCC_DIAG_ON
- CATCH
+#llvm10: TypenameMacros:
+#llvm10: - STACK_OF
+#llvm10: - LIST
+#llvm11: WhitespaceSensitiveMacros:
+#llvm11: - STRINGIZE
+#llvm11: - PP_STRINGIZE
...
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
index 6bf522c..230a341 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -8,7 +8,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Run clang-format style check for C programs.
- uses: DoozyX/clang-format-lint-action@v0.10
+ uses: DoozyX/clang-format-lint-action@v0.11
with:
source: '.'
extensions: 'c,h,cpp,hpp'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c891bac..4d0d3bb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,14 +17,19 @@ jobs:
strategy:
# fail-fast: false
matrix:
- name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "Ubuntu Debug GCC", "macOS Latest Clang", "Ubuntu Autotools GCC"]
+ name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "Ubuntu Debug GCC", "macOS Latest Clang", "Ubuntu Autotools GCC", "Windows TS MSVC", "Ubuntu TS GCC", "TS Debug GCC", "macOS TS Clang", "TS Autotools GCC"]
include:
- name: "Windows Latest MSVC"
artifact: "Windows-MSVC.tar.xz"
os: windows-latest
build_type: "Release"
toolchain: ""
+ cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
+ parallel: OFF
generator: "-G \"Visual Studio 16 2019\" -A x64"
- name: "Ubuntu Latest GCC"
artifact: "Linux.tar.xz"
@@ -32,6 +37,9 @@ jobs:
build_type: "Release"
cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/GCC.cmake"
generator: "-G Ninja"
@@ -41,6 +49,9 @@ jobs:
build_type: "Release"
cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/clang.cmake"
generator: "-G Ninja"
@@ -50,15 +61,82 @@ jobs:
build_type: "Debug"
cpp: ON
fortran: OFF
+ java: OFF
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/GCC.cmake"
generator: "-G Ninja"
- name: "Ubuntu Autotools GCC"
- artifact: "Linux.tar.xz"
+ artifact: "LinuxA.tar.xz"
os: ubuntu-latest
build_type: "Release"
cpp: enable
fortran: enable
+ java: enable
+ ts: disable
+ hl: enable
+ parallel: disable
+ toolchain: ""
+ generator: "autogen"
+# Threadsafe runs
+ - name: "Windows TS MSVC"
+ artifact: "Windows-MSVCTS.tar.xz"
+ os: windows-latest
+ build_type: "Release"
+ toolchain: ""
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ generator: "-G \"Visual Studio 16 2019\" -A x64"
+ - name: "Ubuntu TS GCC"
+ artifact: "LinuxTS.tar.xz"
+ os: ubuntu-latest
+ build_type: "Release"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/GCC.cmake"
+ generator: "-G Ninja"
+ - name: "macOS TS Clang"
+ artifact: "macOSTS.tar.xz"
+ os: macos-latest
+ build_type: "Release"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/clang.cmake"
+ generator: "-G Ninja"
+ - name: "TS Debug GCC"
+ artifact: "LinuxTSDBG.tar.xz"
+ os: ubuntu-latest
+ build_type: "Debug"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/GCC.cmake"
+ generator: "-G Ninja"
+ - name: "TS Autotools GCC"
+ artifact: "LinuxATS.tar.xz"
+ os: ubuntu-latest
+ build_type: "Release"
+ cpp: disable
+ fortran: disable
+ java: disable
+ ts: enable
+ hl: disable
parallel: disable
toolchain: ""
generator: "autogen"
@@ -109,7 +187,7 @@ jobs:
sh ./bin/chkmanifest
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
- $GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --enable-java
+ $GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.ts }}-threadsafe --${{ matrix.hl }}-hl --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java
shell: bash
- name: Configure
@@ -117,7 +195,7 @@ jobs:
run: |
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
- cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=ON $GITHUB_WORKSPACE
+ cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_THREADSAFE:BOOL=${{ matrix.ts }} -DHDF5_BUILD_HL_LIB:BOOL=${{ matrix.hl }} -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=${{ matrix.java }} $GITHUB_WORKSPACE
shell: bash
- name: Autotools Build
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 47feb7a..8c3bb2c 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -12,14 +12,19 @@ jobs:
strategy:
# fail-fast: false
matrix:
- name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "Ubuntu Debug GCC", "macOS Latest Clang", "Ubuntu Autotools GCC"]
+ name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "Ubuntu Debug GCC", "macOS Latest Clang", "Ubuntu Autotools GCC", "Windows TS MSVC", "Ubuntu TS GCC", "TS Debug GCC", "macOS TS Clang", "TS Autotools GCC"]
include:
- name: "Windows Latest MSVC"
artifact: "Windows-MSVC.tar.xz"
os: windows-latest
build_type: "Release"
toolchain: ""
+ cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
+ parallel: OFF
generator: "-G \"Visual Studio 16 2019\" -A x64"
- name: "Ubuntu Latest GCC"
artifact: "Linux.tar.xz"
@@ -27,6 +32,9 @@ jobs:
build_type: "Release"
cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/GCC.cmake"
generator: "-G Ninja"
@@ -36,6 +44,9 @@ jobs:
build_type: "Release"
cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/clang.cmake"
generator: "-G Ninja"
@@ -45,15 +56,82 @@ jobs:
build_type: "Debug"
cpp: ON
fortran: OFF
+ java: OFF
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/GCC.cmake"
generator: "-G Ninja"
- name: "Ubuntu Autotools GCC"
- artifact: "Linux.tar.xz"
+ artifact: "LinuxA.tar.xz"
os: ubuntu-latest
build_type: "Release"
cpp: enable
fortran: enable
+ java: enable
+ ts: disable
+ hl: enable
+ parallel: disable
+ toolchain: ""
+ generator: "autogen"
+# Threadsafe runs
+ - name: "Windows TS MSVC"
+ artifact: "Windows-MSVCTS.tar.xz"
+ os: windows-latest
+ build_type: "Release"
+ toolchain: ""
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ generator: "-G \"Visual Studio 16 2019\" -A x64"
+ - name: "Ubuntu TS GCC"
+ artifact: "LinuxTS.tar.xz"
+ os: ubuntu-latest
+ build_type: "Release"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/GCC.cmake"
+ generator: "-G Ninja"
+ - name: "macOS TS Clang"
+ artifact: "macOSTS.tar.xz"
+ os: macos-latest
+ build_type: "Release"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/clang.cmake"
+ generator: "-G Ninja"
+ - name: "TS Debug GCC"
+ artifact: "LinuxTSDBG.tar.xz"
+ os: ubuntu-latest
+ build_type: "Debug"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/GCC.cmake"
+ generator: "-G Ninja"
+ - name: "TS Autotools GCC"
+ artifact: "LinuxATS.tar.xz"
+ os: ubuntu-latest
+ build_type: "Release"
+ cpp: disable
+ fortran: disable
+ java: disable
+ ts: enable
+ hl: disable
parallel: disable
toolchain: ""
generator: "autogen"
@@ -70,6 +148,7 @@ jobs:
name: ${{ matrix.name }}
# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
+ if: "!contains(github.event.head_commit.message, 'skip-ci')"
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
@@ -103,7 +182,7 @@ jobs:
sh ./bin/chkmanifest
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
- $GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --enable-java
+ $GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.ts }}-threadsafe --${{ matrix.hl }}-hl --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java
shell: bash
- name: Configure
@@ -111,7 +190,7 @@ jobs:
run: |
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
- cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=ON $GITHUB_WORKSPACE
+ cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_THREADSAFE:BOOL=${{ matrix.ts }} -DHDF5_BUILD_HL_LIB:BOOL=${{ matrix.hl }} -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=${{ matrix.java }} $GITHUB_WORKSPACE
shell: bash
- name: Autotools Build
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index 2d1185b..02f0cbc 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -435,7 +435,7 @@ class H5_DLLCPP PredType : public AtomType {
#if H5_SIZEOF_UINT_FAST64_T != 0
static PredType *NATIVE_UINT_FAST64_;
#endif /* H5_SIZEOF_UINT_FAST64_T */
- // End of Declaration of pointers
+ // End of Declaration of pointers
#endif // DOXYGEN_SHOULD_SKIP_THIS
diff --git a/doxygen/examples/H5Fclose.c b/doxygen/examples/H5Fclose.c
index 6bb1d9f..525bad3 100644
--- a/doxygen/examples/H5Fclose.c
+++ b/doxygen/examples/H5Fclose.c
@@ -1,12 +1,13 @@
#include "hdf5.h"
-int main()
+int
+main()
{
- hid_t file;
- if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
- return -1;
- /* Do something good with this file. */
- if(H5Fclose(file) < 0)
- return -2;
- return 0;
+ hid_t file;
+ if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+ return -1;
+ /* Do something good with this file. */
+ if (H5Fclose(file) < 0)
+ return -2;
+ return 0;
}
diff --git a/doxygen/examples/H5Fcreate.c b/doxygen/examples/H5Fcreate.c
index 6bb1d9f..525bad3 100644
--- a/doxygen/examples/H5Fcreate.c
+++ b/doxygen/examples/H5Fcreate.c
@@ -1,12 +1,13 @@
#include "hdf5.h"
-int main()
+int
+main()
{
- hid_t file;
- if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
- return -1;
- /* Do something good with this file. */
- if(H5Fclose(file) < 0)
- return -2;
- return 0;
+ hid_t file;
+ if ((file = H5Fcreate("foo.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+ return -1;
+ /* Do something good with this file. */
+ if (H5Fclose(file) < 0)
+ return -2;
+ return 0;
}
diff --git a/doxygen/examples/hello_hdf5.c b/doxygen/examples/hello_hdf5.c
index 56a179c..a37d39f 100644
--- a/doxygen/examples/hello_hdf5.c
+++ b/doxygen/examples/hello_hdf5.c
@@ -1,12 +1,13 @@
#include "hdf5.h"
-int main()
+int
+main()
{
- herr_t retval;
- unsigned majnum, minnum, relnum;
+ herr_t retval;
+ unsigned majnum, minnum, relnum;
- if ((retval = H5get_libversion(&majnum, &minnum, &relnum)) >= 0) {
- printf("Hello, HDF5 %d.%d.%d!\n", majnum, minnum, relnum);
- }
- return retval;
+ if ((retval = H5get_libversion(&majnum, &minnum, &relnum)) >= 0) {
+ printf("Hello, HDF5 %d.%d.%d!\n", majnum, minnum, relnum);
+ }
+ return retval;
}
diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c
index 95be74d..3a9aa87 100644
--- a/java/src/jni/h5sImp.c
+++ b/java/src/jni/h5sImp.c
@@ -1348,7 +1348,7 @@ done:
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Sselect_1copy(JNIEnv *env, jclass clss, jlong dst_id, jlong src_id)
{
- herr_t status = FAIL;
+ herr_t status = FAIL;
UNUSED(clss);
@@ -1692,7 +1692,7 @@ done:
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Smodify_1select(JNIEnv *env, jclass clss, jlong space1_id, jint op, jlong space2_id)
{
- herr_t status = FAIL;
+ herr_t status = FAIL;
UNUSED(clss);
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 8442121..7165482 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -587,10 +587,10 @@ typedef struct H5F_t H5F_t;
#define H5F_ACS_CLEAR_STATUS_FLAGS_NAME \
"clear_status_flags" /* Whether to clear superblock status_flags (private property only used by h5clear) \
*/
-#define H5F_ACS_NULL_FSM_ADDR_NAME "null_fsm_addr" /* Nullify addresses of free-space managers */
- /* Private property used only by h5clear */
-#define H5F_ACS_SKIP_EOF_CHECK_NAME "skip_eof_check" /* Skip EOF check */
- /* Private property used only by h5clear */
+#define H5F_ACS_NULL_FSM_ADDR_NAME "null_fsm_addr" /* Nullify addresses of free-space managers */
+/* Private property used only by h5clear */
+#define H5F_ACS_SKIP_EOF_CHECK_NAME "skip_eof_check" /* Skip EOF check */
+/* Private property used only by h5clear */
#define H5F_ACS_USE_MDC_LOGGING_NAME "use_mdc_logging" /* Whether to use metadata cache logging */
#define H5F_ACS_MDC_LOG_LOCATION_NAME "mdc_log_location" /* Name of metadata cache log location */
#define H5F_ACS_START_MDC_LOG_ON_ACCESS_NAME \
@@ -653,7 +653,7 @@ typedef struct H5F_t H5F_t;
must compensate. -QAK \
*/
#define HDF5_BTREE_IK_MAX_ENTRIES 65536 /* 2^16 - 2 bytes for storing entries (children) */
- /* See format specification on version 1 B-trees */
+/* See format specification on version 1 B-trees */
/* Default file space handling strategy */
#define H5F_FILE_SPACE_STRATEGY_DEF H5F_FSPACE_STRATEGY_FSM_AGGR
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 817e707..7d2a27d 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -884,12 +884,12 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
/* Do the same kluge until we know for sure. VC */
#if 1 /* bug fix test code -- tidy this up if all goes well */ /* JRM */
- /* KLUGE ALERT!!
- *
- * H5F__super_ext_write_msg() expects f->shared->sblock to
- * be set -- verify that it is NULL, and then set it.
- * Set it back to NULL when we are done.
- */
+ /* KLUGE ALERT!!
+ *
+ * H5F__super_ext_write_msg() expects f->shared->sblock to
+ * be set -- verify that it is NULL, and then set it.
+ * Set it back to NULL when we are done.
+ */
HDassert(f->shared->sblock == NULL);
f->shared->sblock = sblock;
#endif /* JRM */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 31b3748..32d85e7 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -231,7 +231,7 @@ typedef struct H5O_copy_t {
#define H5O_FSINFO_ID 0x0017 /* File space info message. */
#define H5O_MDCI_MSG_ID 0x0018 /* Metadata Cache Image Message */
#define H5O_UNKNOWN_ID 0x0019 /* Placeholder message ID for unknown message. */
- /* (this should never exist in a file) */
+/* (this should never exist in a file) */
/*
* Note: Must increment H5O_MSG_TYPES in H5Opkg.h and update H5O_msg_class_g
* in H5O.c when creating a new message type. Also bump the value of
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index e0042bd..b6d6423 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -133,10 +133,10 @@ struct H5S_pnt_list_t {
H5S_pnt_node_t *head; /* Pointer to head of point list */
H5S_pnt_node_t *tail; /* Pointer to tail of point list */
- hsize_t last_idx; /* Index of the point after the last returned from H5S__get_select_elem_pointlist() */
+ hsize_t last_idx; /* Index of the point after the last returned from H5S__get_select_elem_pointlist() */
H5S_pnt_node_t *last_idx_pnt; /* Point after the last returned from H5S__get_select_elem_pointlist().
- * If we ever add a way to remove points or add points in the middle of
- * the pointlist we will need to invalidate these fields. */
+ * If we ever add a way to remove points or add points in the middle of
+ * the pointlist we will need to invalidate these fields. */
};
/* Information about hyperslab spans */
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 00e9335..b8067ee 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -834,7 +834,7 @@ H5S__copy_pnt_list(const H5S_pnt_list_t *src, unsigned rank)
H5MM_memcpy(dst->low_bounds, src->low_bounds, (rank * sizeof(hsize_t)));
/* Clear cached iteration point */
- dst->last_idx = 0;
+ dst->last_idx = 0;
dst->last_idx_pnt = NULL;
/* Set return value */
@@ -1361,8 +1361,8 @@ static herr_t
H5S__get_select_elem_pointlist(const H5S_t *space, hsize_t startpoint, hsize_t numpoints, hsize_t *buf)
{
const hsize_t endpoint = startpoint + numpoints; /* Index of last point in iteration */
- H5S_pnt_node_t *node; /* Point node */
- unsigned rank; /* Dataspace rank */
+ H5S_pnt_node_t *node; /* Point node */
+ unsigned rank; /* Dataspace rank */
FUNC_ENTER_STATIC_NOERR
@@ -1373,8 +1373,8 @@ H5S__get_select_elem_pointlist(const H5S_t *space, hsize_t startpoint, hsize_t n
rank = space->extent.rank;
/* Check for cached point at the correct index */
- if(space->select.sel_info.pnt_lst->last_idx_pnt
- && startpoint == space->select.sel_info.pnt_lst->last_idx)
+ if (space->select.sel_info.pnt_lst->last_idx_pnt &&
+ startpoint == space->select.sel_info.pnt_lst->last_idx)
node = space->select.sel_info.pnt_lst->last_idx_pnt;
else {
/* Get the head of the point list */
@@ -1385,7 +1385,7 @@ H5S__get_select_elem_pointlist(const H5S_t *space, hsize_t startpoint, hsize_t n
startpoint--;
node = node->next;
} /* end while */
- } /* end else */
+ } /* end else */
/* Iterate through the node, copying each point's information */
while (node != NULL && numpoints > 0) {
@@ -1396,7 +1396,7 @@ H5S__get_select_elem_pointlist(const H5S_t *space, hsize_t startpoint, hsize_t n
} /* end while */
/* Cached next point in iteration */
- space->select.sel_info.pnt_lst->last_idx = endpoint;
+ space->select.sel_info.pnt_lst->last_idx = endpoint;
space->select.sel_info.pnt_lst->last_idx_pnt = node;
FUNC_LEAVE_NOAPI(SUCCEED)
@@ -2191,7 +2191,7 @@ H5S__point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *of
} /* end else */
/* Clear cached iteration point */
- new_space->select.sel_info.pnt_lst->last_idx = 0;
+ new_space->select.sel_info.pnt_lst->last_idx = 0;
new_space->select.sel_info.pnt_lst->last_idx_pnt = NULL;
/* Number of elements selected will be the same */
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index eb8436a..90af459 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -199,7 +199,7 @@ typedef struct {
/* Opaque information */
#define H5T_OPAQUE_TAG_MAX 256 /* Maximum length of an opaque tag */
- /* This could be raised without too much difficulty */
+/* This could be raised without too much difficulty */
#ifdef __cplusplus
extern "C" {
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 97da13c..8b1d042 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -46,12 +46,12 @@ typedef int H5Z_filter_t;
/* General macros */
#define H5Z_FILTER_ALL 0 /* Symbol to remove all filters in H5Premove_filter */
#define H5Z_MAX_NFILTERS 32 /* Maximum number of filters allowed in a pipeline */
- /* (should probably be allowed to be an
- * unlimited amount, but currently each
- * filter uses a bit in a 32-bit field,
- * so the format would have to be
- * changed to accommodate that)
- */
+/* (should probably be allowed to be an
+ * unlimited amount, but currently each
+ * filter uses a bit in a 32-bit field,
+ * so the format would have to be
+ * changed to accommodate that)
+ */
/* Flags for filter definition (stored) */
#define H5Z_FLAG_DEFMASK 0x00ff /*definition flag mask */
diff --git a/src/H5public.h b/src/H5public.h
index 3d07181..facec9a 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -92,11 +92,11 @@ extern "C" {
#endif
/* Version numbers */
-#define H5_VERS_MAJOR 1 /* For major interface/format changes */
-#define H5_VERS_MINOR 10 /* For minor interface/format changes */
-#define H5_VERS_RELEASE 8 /* For tweaks, bug-fixes, or development */
-#define H5_VERS_SUBRELEASE "1" /* For pre-releases like snap0 */
- /* Empty string for real releases. */
+#define H5_VERS_MAJOR 1 /* For major interface/format changes */
+#define H5_VERS_MINOR 10 /* For minor interface/format changes */
+#define H5_VERS_RELEASE 8 /* For tweaks, bug-fixes, or development */
+#define H5_VERS_SUBRELEASE "1" /* For pre-releases like snap0 */
+/* Empty string for real releases. */
#define H5_VERS_INFO "HDF5 library version: 1.10.8-1" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE)
diff --git a/test/fheap.c b/test/fheap.c
index 6bcfd14..f712f8e 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -13850,7 +13850,7 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam
if (NULL == (fh = H5HF_open(f, fh_addr)))
FAIL_STACK_ERROR
#endif /* QAK */
- /* QAK */
+ /* QAK */
/* Check up on heap... */
state.huge_size = obj_size;
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index b890732..4d80759 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -3984,9 +3984,9 @@ no_collective_cause_tests(void)
test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_COMPACT);
test_no_collective_cause_mode(TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_EXTERNAL);
#ifdef LATER /* fletcher32 */
- /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
- * H5Dwrite is ready for mpio + filter feature.
- */
+ /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and
+ * H5Dwrite is ready for mpio + filter feature.
+ */
/* test_no_collective_cause_mode (TEST_FILTERS); */
test_no_collective_cause_mode_filter(TEST_FILTERS_READ);
#endif /* LATER */
generated by cgit v0.12 at 2024-12-28 01:00:26 (GMT)