Merge remote-tracking branch 'hdffv/develop' into rebased-fprintf-experiment

13 files changed, 755 insertions, 594 deletions

diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index 70c458d..083c60e 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -18,8 +18,6 @@ if (HDF5_BUILD_EXAMPLES)
 endif ()
 
 #-- Build the Unit testing if requested
-if (NOT HDF5_EXTERNALLY_CONFIGURED)
-  if (BUILD_TESTING AND HDF5_TEST_SERIAL)
-    add_subdirectory (test)
-  endif ()
+if (BUILD_TESTING AND HDF5_TEST_SERIAL)
+  add_subdirectory (test)
 endif ()
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index 22c9973..037bf8f 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -23,6 +23,13 @@ else ()
 endif ()
 set_target_properties (ptExampleFL PROPERTIES FOLDER examples/hl/cpp)
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  clang_format (HDF5_HL_CPP_EXAMPLES_FORMAT ptExampleFL)
+endif ()
+
 if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index fbabc86..e4678fd 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -9,7 +9,7 @@ set (HDF5_HL_CPP_SOURCES ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp)
 set (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.h)
 
 if (NOT ONLY_SHARED_LIBS)
-  add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SOURCES})
+  add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SOURCES} ${HDF5_HL_CPP_HDRS})
   target_include_directories (${HDF5_HL_CPP_LIB_TARGET}
       PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
       INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
@@ -40,6 +40,17 @@ if (BUILD_SHARED_LIBS)
 endif ()
 
 #-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_HL_CPP_SRC_FORMAT ${HDF5_HL_CPP_LIB_TARGET})
+  else ()
+    clang_format (HDF5_HL_CPP_SRC_FORMAT ${HDF5_HL_CPP_LIBSH_TARGET})
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 install (
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index 5c224a8..246a670 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -25,6 +25,13 @@ else ()
 endif ()
 set_target_properties (hl_ptableTest PROPERTIES FOLDER test/hl/cpp)
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  clang_format (HDF5_HL_CPP_TEST_FORMAT hl_ptableTest)
+endif ()
+
 if (HDF5_TEST_CPP AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index 1707ae9..9bce861 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -37,6 +37,13 @@ foreach (example ${examples})
     target_link_libraries (hl_ex_${example} PRIVATE ${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   endif ()
   set_target_properties (hl_ex_${example} PROPERTIES FOLDER examples/hl)
+
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_HL_EXAMPLES_${example}_FORMAT hl_ex_${example})
+  endif ()
 endforeach ()
 
 if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
diff --git a/hl/examples/pal_rgb.h b/hl/examples/pal_rgb.h
index f3905b3..488ee42 100644
--- a/hl/examples/pal_rgb.h
+++ b/hl/examples/pal_rgb.h
@@ -11,263 +11,266 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-const unsigned char pal_rgb[256*3] = {255,255,255,
-0,0,131,
-0,0,135,
-0,0,139,
-0,0,143,
-0,0,147,
-0,0,151,
-0,0,155,
-0,0,159,
-0,0,163,
-0,0,167,
-0,0,171,
-0,0,175,
-0,0,179,
-0,0,183,
-0,0,187,
-0,0,191,
-0,0,195,
-0,0,199,
-0,0,203,
-0,0,207,
-0,0,211,
-0,0,215,
-0,0,219,
-0,0,223,
-0,0,227,
-0,0,231,
-0,0,235,
-0,0,239,
-0,0,243,
-0,0,247,
-0,0,251,
-0,0,255,
-0,0,255,
-0,3,255,
-0,7,255,
-0,11,255,
-0,15,255,
-0,19,255,
-0,23,255,
-0,27,255,
-0,31,255,
-0,35,255,
-0,39,255,
-0,43,255,
-0,47,255,
-0,51,255,
-0,55,255,
-0,59,255,
-0,63,255,
-0,67,255,
-0,71,255,
-0,75,255,
-0,79,255,
-0,83,255,
-0,87,255,
-0,91,255,
-0,95,255,
-0,99,255,
-0,103,255,
-0,107,255,
-0,111,255,
-0,115,255,
-0,119,255,
-0,123,255,
-0,127,255,
-0,131,255,
-0,135,255,
-0,139,255,
-0,143,255,
-0,147,255,
-0,151,255,
-0,155,255,
-0,159,255,
-0,163,255,
-0,167,255,
-0,171,255,
-0,175,255,
-0,179,255,
-0,183,255,
-0,187,255,
-0,191,255,
-0,195,255,
-0,199,255,
-0,203,255,
-0,207,255,
-0,211,255,
-0,215,255,
-0,219,255,
-0,223,255,
-0,227,255,
-0,231,255,
-0,235,255,
-0,239,255,
-0,243,255,
-0,247,255,
-0,251,255,
-0,255,255,
-0,255,255,
-3,255,251,
-7,255,247,
-11,255,243,
-15,255,239,
-19,255,235,
-23,255,231,
-27,255,227,
-31,255,223,
-35,255,219,
-39,255,215,
-43,255,211,
-47,255,207,
-51,255,203,
-55,255,199,
-59,255,195,
-63,255,191,
-67,255,187,
-71,255,183,
-75,255,179,
-79,255,175,
-83,255,171,
-87,255,167,
-91,255,163,
-95,255,159,
-99,255,155,
-103,255,151,
-107,255,147,
-111,255,143,
-115,255,139,
-119,255,135,
-123,255,131,
-127,255,127,
-131,255,123,
-135,255,119,
-139,255,115,
-143,255,111,
-147,255,107,
-151,255,103,
-155,255,99,
-159,255,95,
-163,255,91,
-167,255,87,
-171,255,83,
-175,255,79,
-179,255,75,
-183,255,71,
-187,255,67,
-191,255,63,
-195,255,59,
-199,255,55,
-203,255,51,
-207,255,47,
-211,255,43,
-215,255,39,
-219,255,35,
-223,255,31,
-227,255,27,
-231,255,23,
-235,255,19,
-239,255,15,
-243,255,11,
-247,255,7,
-251,255,3,
-255,255,0,
-255,251,0,
-255,247,0,
-255,243,0,
-255,239,0,
-255,235,0,
-255,231,0,
-255,227,0,
-255,223,0,
-255,219,0,
-255,215,0,
-255,211,0,
-255,207,0,
-255,203,0,
-255,199,0,
-255,195,0,
-255,191,0,
-255,187,0,
-255,183,0,
-255,179,0,
-255,175,0,
-255,171,0,
-255,167,0,
-255,163,0,
-255,159,0,
-255,155,0,
-255,151,0,
-255,147,0,
-255,143,0,
-255,139,0,
-255,135,0,
-255,131,0,
-255,127,0,
-255,123,0,
-255,119,0,
-255,115,0,
-255,111,0,
-255,107,0,
-255,103,0,
-255,99,0,
-255,95,0,
-255,91,0,
-255,87,0,
-255,83,0,
-255,79,0,
-255,75,0,
-255,71,0,
-255,67,0,
-255,63,0,
-255,59,0,
-255,55,0,
-255,51,0,
-255,47,0,
-255,43,0,
-255,39,0,
-255,35,0,
-255,31,0,
-255,27,0,
-255,23,0,
-255,19,0,
-255,15,0,
-255,11,0,
-255,7,0,
-255,3,0,
-255,0,0,
-250,0,0,
-246,0,0,
-241,0,0,
-237,0,0,
-233,0,0,
-228,0,0,
-224,0,0,
-219,0,0,
-215,0,0,
-211,0,0,
-206,0,0,
-202,0,0,
-197,0,0,
-193,0,0,
-189,0,0,
-184,0,0,
-180,0,0,
-175,0,0,
-171,0,0,
-167,0,0,
-162,0,0,
-158,0,0,
-153,0,0,
-149,0,0,
-145,0,0,
-140,0,0,
-136,0,0,
-131,0,0,
-127,0,0
+/* clang-format off */
+const unsigned char pal_rgb[256*3] = {
+        255,255,255,
+        0,0,131,
+        0,0,135,
+        0,0,139,
+        0,0,143,
+        0,0,147,
+        0,0,151,
+        0,0,155,
+        0,0,159,
+        0,0,163,
+        0,0,167,
+        0,0,171,
+        0,0,175,
+        0,0,179,
+        0,0,183,
+        0,0,187,
+        0,0,191,
+        0,0,195,
+        0,0,199,
+        0,0,203,
+        0,0,207,
+        0,0,211,
+        0,0,215,
+        0,0,219,
+        0,0,223,
+        0,0,227,
+        0,0,231,
+        0,0,235,
+        0,0,239,
+        0,0,243,
+        0,0,247,
+        0,0,251,
+        0,0,255,
+        0,0,255,
+        0,3,255,
+        0,7,255,
+        0,11,255,
+        0,15,255,
+        0,19,255,
+        0,23,255,
+        0,27,255,
+        0,31,255,
+        0,35,255,
+        0,39,255,
+        0,43,255,
+        0,47,255,
+        0,51,255,
+        0,55,255,
+        0,59,255,
+        0,63,255,
+        0,67,255,
+        0,71,255,
+        0,75,255,
+        0,79,255,
+        0,83,255,
+        0,87,255,
+        0,91,255,
+        0,95,255,
+        0,99,255,
+        0,103,255,
+        0,107,255,
+        0,111,255,
+        0,115,255,
+        0,119,255,
+        0,123,255,
+        0,127,255,
+        0,131,255,
+        0,135,255,
+        0,139,255,
+        0,143,255,
+        0,147,255,
+        0,151,255,
+        0,155,255,
+        0,159,255,
+        0,163,255,
+        0,167,255,
+        0,171,255,
+        0,175,255,
+        0,179,255,
+        0,183,255,
+        0,187,255,
+        0,191,255,
+        0,195,255,
+        0,199,255,
+        0,203,255,
+        0,207,255,
+        0,211,255,
+        0,215,255,
+        0,219,255,
+        0,223,255,
+        0,227,255,
+        0,231,255,
+        0,235,255,
+        0,239,255,
+        0,243,255,
+        0,247,255,
+        0,251,255,
+        0,255,255,
+        0,255,255,
+        3,255,251,
+        7,255,247,
+        11,255,243,
+        15,255,239,
+        19,255,235,
+        23,255,231,
+        27,255,227,
+        31,255,223,
+        35,255,219,
+        39,255,215,
+        43,255,211,
+        47,255,207,
+        51,255,203,
+        55,255,199,
+        59,255,195,
+        63,255,191,
+        67,255,187,
+        71,255,183,
+        75,255,179,
+        79,255,175,
+        83,255,171,
+        87,255,167,
+        91,255,163,
+        95,255,159,
+        99,255,155,
+        103,255,151,
+        107,255,147,
+        111,255,143,
+        115,255,139,
+        119,255,135,
+        123,255,131,
+        127,255,127,
+        131,255,123,
+        135,255,119,
+        139,255,115,
+        143,255,111,
+        147,255,107,
+        151,255,103,
+        155,255,99,
+        159,255,95,
+        163,255,91,
+        167,255,87,
+        171,255,83,
+        175,255,79,
+        179,255,75,
+        183,255,71,
+        187,255,67,
+        191,255,63,
+        195,255,59,
+        199,255,55,
+        203,255,51,
+        207,255,47,
+        211,255,43,
+        215,255,39,
+        219,255,35,
+        223,255,31,
+        227,255,27,
+        231,255,23,
+        235,255,19,
+        239,255,15,
+        243,255,11,
+        247,255,7,
+        251,255,3,
+        255,255,0,
+        255,251,0,
+        255,247,0,
+        255,243,0,
+        255,239,0,
+        255,235,0,
+        255,231,0,
+        255,227,0,
+        255,223,0,
+        255,219,0,
+        255,215,0,
+        255,211,0,
+        255,207,0,
+        255,203,0,
+        255,199,0,
+        255,195,0,
+        255,191,0,
+        255,187,0,
+        255,183,0,
+        255,179,0,
+        255,175,0,
+        255,171,0,
+        255,167,0,
+        255,163,0,
+        255,159,0,
+        255,155,0,
+        255,151,0,
+        255,147,0,
+        255,143,0,
+        255,139,0,
+        255,135,0,
+        255,131,0,
+        255,127,0,
+        255,123,0,
+        255,119,0,
+        255,115,0,
+        255,111,0,
+        255,107,0,
+        255,103,0,
+        255,99,0,
+        255,95,0,
+        255,91,0,
+        255,87,0,
+        255,83,0,
+        255,79,0,
+        255,75,0,
+        255,71,0,
+        255,67,0,
+        255,63,0,
+        255,59,0,
+        255,55,0,
+        255,51,0,
+        255,47,0,
+        255,43,0,
+        255,39,0,
+        255,35,0,
+        255,31,0,
+        255,27,0,
+        255,23,0,
+        255,19,0,
+        255,15,0,
+        255,11,0,
+        255,7,0,
+        255,3,0,
+        255,0,0,
+        250,0,0,
+        246,0,0,
+        241,0,0,
+        237,0,0,
+        233,0,0,
+        228,0,0,
+        224,0,0,
+        219,0,0,
+        215,0,0,
+        211,0,0,
+        206,0,0,
+        202,0,0,
+        197,0,0,
+        193,0,0,
+        189,0,0,
+        184,0,0,
+        180,0,0,
+        175,0,0,
+        171,0,0,
+        167,0,0,
+        162,0,0,
+        158,0,0,
+        153,0,0,
+        149,0,0,
+        145,0,0,
+        140,0,0,
+        136,0,0,
+        131,0,0,
+        127,0,0
 };
+/* clang-format on */
 
 
 
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index d682d5f..789d2fa 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -15,7 +15,7 @@ endif ()
 # Generate the H5LT and H5TB REAL APIs
 #-----------------------------------------------------------------------------
 
-add_executable (H5HL_buildiface ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5HL_buildiface.F90  )
+add_executable (H5HL_buildiface ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5HL_buildiface.F90)
 target_include_directories (H5HL_buildiface PRIVATE "${HDF5_BINARY_DIR};${HDF5_F90_BINARY_DIR}")
 if (WIN32 AND MSVC)
   if (BUILD_SHARED_LIBS)
@@ -54,7 +54,7 @@ set (HDF5_HL_F90_C_SOURCES
 )
 set_source_files_properties (${HDF5_HL_F90_C_SOURCES} PROPERTIES LANGUAGE C)
 
-set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h)
+set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMcc.h)
 
 if (NOT ONLY_SHARED_LIBS)
   add_library (${HDF5_HL_F90_C_LIB_TARGET} STATIC ${HDF5_HL_F90_C_SOURCES} ${HDF5_HL_F90_HEADERS})
@@ -93,6 +93,17 @@ if (BUILD_SHARED_LIBS)
 endif ()
 
 #-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_HL_F90_C_SRC_FORMAT ${HDF5_HL_F90_C_LIB_TARGET})
+  else ()
+    clang_format (HDF5_HL_F90_C_SRC_FORMAT ${HDF5_HL_F90_C_LIBSH_TARGET})
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
 # Fortran Modules
 #-----------------------------------------------------------------------------
 set (HDF5_HL_F90_F_BASE_SOURCES
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index c4ddf19..e73c470 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -30,6 +30,14 @@ set (HL_HEADERS
 
 set (HL_PRIVATE_HEADERS
     ${HDF5_HL_SRC_SOURCE_DIR}/H5LTparse.h
+    ${HDF5_HL_SRC_SOURCE_DIR}/H5DSprivate.h
+    ${HDF5_HL_SRC_SOURCE_DIR}/H5IMprivate.h
+    ${HDF5_HL_SRC_SOURCE_DIR}/H5PTprivate.h
+    ${HDF5_HL_SRC_SOURCE_DIR}/H5HLprivate2.h
+    ${HDF5_HL_SRC_SOURCE_DIR}/H5LTprivate.h
+    ${HDF5_HL_SRC_SOURCE_DIR}/H5PTprivate.h
+    ${HDF5_HL_SRC_SOURCE_DIR}/H5TBprivate.h
+    ${HDF5_HL_SRC_SOURCE_DIR}/H5LDprivate.h
 )
 
 if (NOT ONLY_SHARED_LIBS)
@@ -64,6 +72,17 @@ if (BUILD_SHARED_LIBS)
 endif ()
 
 #-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_HL_SRC_FORMAT ${HDF5_HL_LIB_TARGET})
+  else ()
+    clang_format (HDF5_HL_SRC_FORMAT ${HDF5_HL_LIBSH_TARGET})
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 install (
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 939f6aa..0003018 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -58,17 +58,17 @@ size_t  indent = 0;
 
 /* Data structure to pass application data to callbacks. */
 typedef struct {
-    void *app_image_ptr;	/* Pointer to application buffer */
-    size_t app_image_size;	/* Size of application buffer */
-    void *fapl_image_ptr;	/* Pointer to FAPL buffer */
-    size_t fapl_image_size;	/* Size of FAPL buffer */
-    int fapl_ref_count;		/* Reference counter for FAPL buffer */
-    void *vfd_image_ptr;	/* Pointer to VFD buffer */
-    size_t vfd_image_size;	/* Size of VFD buffer */
-    int vfd_ref_count;		/* Reference counter for VFD buffer */
-    unsigned flags;		/* Flags indicate how the file image will */
+    void *app_image_ptr;    /* Pointer to application buffer */
+    size_t app_image_size;    /* Size of application buffer */
+    void *fapl_image_ptr;    /* Pointer to FAPL buffer */
+    size_t fapl_image_size;    /* Size of FAPL buffer */
+    int fapl_ref_count;        /* Reference counter for FAPL buffer */
+    void *vfd_image_ptr;    /* Pointer to VFD buffer */
+    size_t vfd_image_size;    /* Size of VFD buffer */
+    int vfd_ref_count;        /* Reference counter for VFD buffer */
+    unsigned flags;        /* Flags indicate how the file image will */
                                 /* be open */
-    int ref_count;		/* Reference counter on udata struct */
+    int ref_count;        /* Reference counter on udata struct */
 } H5LT_file_image_ud_t;
 
 /* callbacks prototypes for file image ops */
@@ -81,7 +81,7 @@ static herr_t udata_free(void *udata);
 
 /* Definition of callbacks for file image operations. */
 
-
+
 /*-------------------------------------------------------------------------
 * Function: image_malloc
 *
@@ -127,9 +127,9 @@ image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
             udata->fapl_image_size = udata->app_image_size;
             return_value = udata->fapl_image_ptr;
             udata->fapl_ref_count++;
-	    break;
+            break;
 
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
             if (udata->fapl_image_ptr == NULL)
                 goto out;
             if (udata->fapl_image_size != size)
@@ -139,7 +139,7 @@ image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
 
             return_value = udata->fapl_image_ptr;
             udata->fapl_ref_count++;
-	    break;
+            break;
 
         case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET:
             goto out;
@@ -160,16 +160,16 @@ image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
                 goto out;
 
             udata->vfd_image_ptr = udata->fapl_image_ptr;
- 	    udata->vfd_image_size = size;
+            udata->vfd_image_size = size;
             udata->vfd_ref_count++;
             return_value = udata->vfd_image_ptr;
             break;
 
-	/* added unused labels to shut the compiler up */
-	case H5FD_FILE_IMAGE_OP_NO_OP:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
-	case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
-	case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
+        /* added unused labels to shut the compiler up */
+        case H5FD_FILE_IMAGE_OP_NO_OP:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
+        case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
+        case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
         default:
             goto out;
     } /* end switch */
@@ -180,7 +180,7 @@ out:
     return NULL;
 } /* end image_malloc() */
 
-
+
 /*-------------------------------------------------------------------------
 * Function: image_memcpy
 *
@@ -251,11 +251,11 @@ image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file
                 goto out;
             break;
 
-	/* added unused labels to shut the compiler up */
-	case H5FD_FILE_IMAGE_OP_NO_OP:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
-	case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
-	case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
+        /* added unused labels to shut the compiler up */
+        case H5FD_FILE_IMAGE_OP_NO_OP:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
+        case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
+        case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
         default:
             goto out;
     } /* end switch */
@@ -266,7 +266,7 @@ out:
     return NULL;
 } /* end image_memcpy() */
 
-
+
 /*-------------------------------------------------------------------------
 * Function: image_realloc
 *
@@ -351,7 +351,7 @@ image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *_udata)
 
     switch(file_image_op) {
         case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
-	    if (udata->fapl_image_ptr != ptr)
+            if (udata->fapl_image_ptr != ptr)
                 goto out;
             if (udata->fapl_ref_count == 0)
                 goto out;
@@ -386,14 +386,14 @@ image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *_udata)
             } /* end if */
             break;
 
-	/* added unused labels to keep the compiler quite */
-	case H5FD_FILE_IMAGE_OP_NO_OP:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
-	case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET:
-	case H5FD_FILE_IMAGE_OP_FILE_OPEN:
-	case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
-	default:
+        /* added unused labels to keep the compiler quite */
+        case H5FD_FILE_IMAGE_OP_NO_OP:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET:
+        case H5FD_FILE_IMAGE_OP_FILE_OPEN:
+        case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
+        default:
             goto out;
     } /* end switch */
 
@@ -403,7 +403,7 @@ out:
     return(FAIL);
 } /* end image_free() */
 
-
+
 /*-------------------------------------------------------------------------
 * Function: udata_copy
 *
@@ -843,7 +843,7 @@ out:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
 * Function: H5LTopen_file_image
 *
@@ -859,9 +859,9 @@ out:
 */
 hid_t H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
 {
-    hid_t		        fapl=-1, file_id=-1;    /* HDF5 identifiers */
+    hid_t                fapl=-1, file_id=-1;    /* HDF5 identifiers */
     unsigned            file_open_flags;        /* Flags for image open */
-    char                file_name[64];	        /* Filename buffer */
+    char                file_name[64];            /* Filename buffer */
     size_t              alloc_incr;             /* Buffer allocation increment */
     size_t              min_incr = 65536;       /* Minimum buffer increment */
     double              buf_prcnt = 0.1f;       /* Percentage of buffer size to set
@@ -898,7 +898,7 @@ hid_t H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
 
     /* Set callbacks for file image ops ONLY if the file image is NOT copied */
     if (flags & H5LT_FILE_IMAGE_DONT_COPY) {
-        H5LT_file_image_ud_t *udata;	/* Pointer to udata structure */
+        H5LT_file_image_ud_t *udata;    /* Pointer to udata structure */
 
         /* Allocate buffer to communicate user data to callbacks */
         if (NULL == (udata = (H5LT_file_image_ud_t *)HDmalloc(sizeof(H5LT_file_image_ud_t))))
@@ -1407,13 +1407,13 @@ find_dataset(hid_t loc_id, const char *name, const H5L_info2_t *linfo, void *op_
  * modify the op_data buffer (i.e.: dset_name) during the traversal, and the
  * library never modifies that buffer.
  */
-H5_GCC_DIAG_OFF(cast-qual)
+H5_GCC_DIAG_OFF("cast-qual")
 herr_t
 H5LTfind_dataset( hid_t loc_id, const char *dset_name )
 {
     return H5Literate2(loc_id, H5_INDEX_NAME, H5_ITER_INC, 0, find_dataset, (void *)dset_name);
 }
-H5_GCC_DIAG_ON(cast-qual)
+H5_GCC_DIAG_ON("cast-qual")
 
 /*-------------------------------------------------------------------------
 *
@@ -2038,13 +2038,13 @@ herr_t H5LTfind_attribute( hid_t loc_id, const char* attr_name )
  * modify the op_data buffer (i.e.: attr_name) during the traversal, and the
  * library never modifies that buffer.
  */
-H5_GCC_DIAG_OFF(cast-qual)
+H5_GCC_DIAG_OFF("cast-qual")
 herr_t
 H5LT_find_attribute( hid_t loc_id, const char* attr_name )
 {
     return H5Aiterate2(loc_id, H5_INDEX_NAME, H5_ITER_INC, NULL, find_attr, (void *)attr_name);
 }
-H5_GCC_DIAG_ON(cast-qual)
+H5_GCC_DIAG_ON("cast-qual")
 
 
 /*-------------------------------------------------------------------------
@@ -2297,13 +2297,13 @@ realloc_and_append(hbool_t _no_user_buf, size_t *len, char *buf, const char *str
        * extend past the allocated buffer; if it does then truncate the string
        */
       if(size_str < *len - 1) {
-	if( size_str + size_str_to_add < *len - 1) {
-	  HDstrncat(buf, str_to_add, size_str_to_add);
-	} else {
-	  HDstrncat(buf, str_to_add, (*len - 1) - size_str);
-	}
+          if( size_str + size_str_to_add < *len - 1) {
+              HDstrncat(buf, str_to_add, size_str_to_add);
+          } else {
+              HDstrncat(buf, str_to_add, (*len - 1) - size_str);
+          }
       } else {
-	buf[*len-1] = '\0'; /* buffer is full, null terminate */
+         buf[*len-1] = '\0'; /* buffer is full, null terminate */
       }
     }
 
@@ -3062,15 +3062,15 @@ next:
             HDsnprintf(dt_str, *slen, "H5T_NO_CLASS");
             break;
         case H5T_REFERENCE:
-	    if (H5Tequal(dtype, H5T_STD_REF_DSETREG) == TRUE) {
-	      HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_DSETREG }");
-	    }
-	    else {
-	      HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_OBJECT }");
-	    }
-	    break;
+            if (H5Tequal(dtype, H5T_STD_REF_DSETREG) == TRUE) {
+                HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_DSETREG }");
+            }
+            else {
+                HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_OBJECT }");
+            }
+            break;
         case H5T_NCLASSES:
-	    break;
+            break;
         default:
             HDsnprintf(dt_str, *slen, "unknown data type");
     }
@@ -3626,7 +3626,7 @@ out:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
 * Function: H5LT_set_attribute_string
 *
@@ -3746,12 +3746,12 @@ H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid)
      if(HDstrncmp(path, ".", path_length) == 0) {
        if(check_object_valid) {
          obj_exists = H5Oexists_by_name(loc_id, path, H5P_DEFAULT);
-	 ret_value = obj_exists;
-	 goto done;
+    ret_value = obj_exists;
+    goto done;
        } else {
-	 ret_value = TRUE; /* Since the object is the identifier itself,
-			    * we can only check if loc_id is a valid type */
-	 goto done;
+    ret_value = TRUE; /* Since the object is the identifier itself,
+                * we can only check if loc_id is a valid type */
+    goto done;
        }
      }
 
@@ -3775,20 +3775,20 @@ H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid)
 
        obj_exists = FALSE;
        if((link_exists = H5Lexists(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
-	 ret_value = FAIL;
-	 goto done;
+    ret_value = FAIL;
+    goto done;
        }
 
        /* If target link does not exist then no reason to
         *  continue checking the path */
        if(link_exists != TRUE) {
-	 ret_value = FALSE;
-	 goto done;
+    ret_value = FALSE;
+    goto done;
        }
 
        /* Determine if link resolves to an actual object */
        if((obj_exists = H5Oexists_by_name(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
-	 ret_value = FAIL;
+    ret_value = FAIL;
          goto done;
        }
 
@@ -3812,11 +3812,11 @@ H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid)
        ret_value = link_exists;
        /* Determine if link resolves to an actual object for check_object_valid TRUE */
        if(check_object_valid == TRUE && link_exists == TRUE) {
-	 if((obj_exists = H5Oexists_by_name(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
-	   ret_value = FAIL;
-	 } else {
-	   ret_value = obj_exists;
-	 }
+         if((obj_exists = H5Oexists_by_name(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
+           ret_value = FAIL;
+         } else {
+           ret_value = obj_exists;
+         }
        }
      }
 
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index 6349bb3..2fc0c87 100644
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@@ -37,6 +37,13 @@ macro (HL_ADD_EXE hl_name)
     )
   endif ()
   set_target_properties (hl_${hl_name} PROPERTIES FOLDER test/hl)
+
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_HL_TEST_${hl_name}_FORMAT hl_${hl_name})
+  endif ()
 endmacro ()
 
 HL_ADD_EXE (test_lite)
@@ -69,6 +76,13 @@ else ()
 endif ()
 set_target_properties (hl_test_packet PROPERTIES FOLDER test/hl)
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  clang_format (HDF5_HL_TEST_hl_test_packet_FORMAT hl_test_packet)
+endif ()
+
 # --------------------------------------------------------------------
 # This executable is used to generate test files for the test_ds test.
 # It should only be run during development when new test files are needed
@@ -85,6 +99,13 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
   )
   set_target_properties (hl_gen_test_ds PROPERTIES FOLDER test/hl/gen)
 
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_HL_TEST_hl_gen_test_ds_FORMAT hl_gen_test_ds)
+  endif ()
+
   add_executable (hl_gen_test_ld gen_test_ld.c)
   target_compile_options(hl_gen_test_ld PRIVATE "${HDF5_CMAKE_C_FLAGS}")
   target_include_directories (hl_gen_test_ld PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
@@ -95,6 +116,13 @@ if (HDF5_BUILD_GENERATORS AND NOT ONLY_SHARED_LIBS)
       ${HDF5_LIB_TARGET}
   )
   set_target_properties (hl_gen_test_ld PROPERTIES FOLDER test/hl/gen)
+
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_HL_TEST_hl_gen_test_ld_FORMAT hl_gen_test_ld)
+  endif ()
 endif ()
 
 if (HDF5_TEST_SERIAL)
diff --git a/hl/test/pal_rgb.h b/hl/test/pal_rgb.h
index 4b22bea..488ee42 100644
--- a/hl/test/pal_rgb.h
+++ b/hl/test/pal_rgb.h
@@ -11,261 +11,270 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-const unsigned char pal_rgb[256*3] = {255,255,255,
-0,0,131,
-0,0,135,
-0,0,139,
-0,0,143,
-0,0,147,
-0,0,151,
-0,0,155,
-0,0,159,
-0,0,163,
-0,0,167,
-0,0,171,
-0,0,175,
-0,0,179,
-0,0,183,
-0,0,187,
-0,0,191,
-0,0,195,
-0,0,199,
-0,0,203,
-0,0,207,
-0,0,211,
-0,0,215,
-0,0,219,
-0,0,223,
-0,0,227,
-0,0,231,
-0,0,235,
-0,0,239,
-0,0,243,
-0,0,247,
-0,0,251,
-0,0,255,
-0,0,255,
-0,3,255,
-0,7,255,
-0,11,255,
-0,15,255,
-0,19,255,
-0,23,255,
-0,27,255,
-0,31,255,
-0,35,255,
-0,39,255,
-0,43,255,
-0,47,255,
-0,51,255,
-0,55,255,
-0,59,255,
-0,63,255,
-0,67,255,
-0,71,255,
-0,75,255,
-0,79,255,
-0,83,255,
-0,87,255,
-0,91,255,
-0,95,255,
-0,99,255,
-0,103,255,
-0,107,255,
-0,111,255,
-0,115,255,
-0,119,255,
-0,123,255,
-0,127,255,
-0,131,255,
-0,135,255,
-0,139,255,
-0,143,255,
-0,147,255,
-0,151,255,
-0,155,255,
-0,159,255,
-0,163,255,
-0,167,255,
-0,171,255,
-0,175,255,
-0,179,255,
-0,183,255,
-0,187,255,
-0,191,255,
-0,195,255,
-0,199,255,
-0,203,255,
-0,207,255,
-0,211,255,
-0,215,255,
-0,219,255,
-0,223,255,
-0,227,255,
-0,231,255,
-0,235,255,
-0,239,255,
-0,243,255,
-0,247,255,
-0,251,255,
-0,255,255,
-0,255,255,
-3,255,251,
-7,255,247,
-11,255,243,
-15,255,239,
-19,255,235,
-23,255,231,
-27,255,227,
-31,255,223,
-35,255,219,
-39,255,215,
-43,255,211,
-47,255,207,
-51,255,203,
-55,255,199,
-59,255,195,
-63,255,191,
-67,255,187,
-71,255,183,
-75,255,179,
-79,255,175,
-83,255,171,
-87,255,167,
-91,255,163,
-95,255,159,
-99,255,155,
-103,255,151,
-107,255,147,
-111,255,143,
-115,255,139,
-119,255,135,
-123,255,131,
-127,255,127,
-131,255,123,
-135,255,119,
-139,255,115,
-143,255,111,
-147,255,107,
-151,255,103,
-155,255,99,
-159,255,95,
-163,255,91,
-167,255,87,
-171,255,83,
-175,255,79,
-179,255,75,
-183,255,71,
-187,255,67,
-191,255,63,
-195,255,59,
-199,255,55,
-203,255,51,
-207,255,47,
-211,255,43,
-215,255,39,
-219,255,35,
-223,255,31,
-227,255,27,
-231,255,23,
-235,255,19,
-239,255,15,
-243,255,11,
-247,255,7,
-251,255,3,
-255,255,0,
-255,251,0,
-255,247,0,
-255,243,0,
-255,239,0,
-255,235,0,
-255,231,0,
-255,227,0,
-255,223,0,
-255,219,0,
-255,215,0,
-255,211,0,
-255,207,0,
-255,203,0,
-255,199,0,
-255,195,0,
-255,191,0,
-255,187,0,
-255,183,0,
-255,179,0,
-255,175,0,
-255,171,0,
-255,167,0,
-255,163,0,
-255,159,0,
-255,155,0,
-255,151,0,
-255,147,0,
-255,143,0,
-255,139,0,
-255,135,0,
-255,131,0,
-255,127,0,
-255,123,0,
-255,119,0,
-255,115,0,
-255,111,0,
-255,107,0,
-255,103,0,
-255,99,0,
-255,95,0,
-255,91,0,
-255,87,0,
-255,83,0,
-255,79,0,
-255,75,0,
-255,71,0,
-255,67,0,
-255,63,0,
-255,59,0,
-255,55,0,
-255,51,0,
-255,47,0,
-255,43,0,
-255,39,0,
-255,35,0,
-255,31,0,
-255,27,0,
-255,23,0,
-255,19,0,
-255,15,0,
-255,11,0,
-255,7,0,
-255,3,0,
-255,0,0,
-250,0,0,
-246,0,0,
-241,0,0,
-237,0,0,
-233,0,0,
-228,0,0,
-224,0,0,
-219,0,0,
-215,0,0,
-211,0,0,
-206,0,0,
-202,0,0,
-197,0,0,
-193,0,0,
-189,0,0,
-184,0,0,
-180,0,0,
-175,0,0,
-171,0,0,
-167,0,0,
-162,0,0,
-158,0,0,
-153,0,0,
-149,0,0,
-145,0,0,
-140,0,0,
-136,0,0,
-131,0,0,
-127,0,0
+/* clang-format off */
+const unsigned char pal_rgb[256*3] = {
+        255,255,255,
+        0,0,131,
+        0,0,135,
+        0,0,139,
+        0,0,143,
+        0,0,147,
+        0,0,151,
+        0,0,155,
+        0,0,159,
+        0,0,163,
+        0,0,167,
+        0,0,171,
+        0,0,175,
+        0,0,179,
+        0,0,183,
+        0,0,187,
+        0,0,191,
+        0,0,195,
+        0,0,199,
+        0,0,203,
+        0,0,207,
+        0,0,211,
+        0,0,215,
+        0,0,219,
+        0,0,223,
+        0,0,227,
+        0,0,231,
+        0,0,235,
+        0,0,239,
+        0,0,243,
+        0,0,247,
+        0,0,251,
+        0,0,255,
+        0,0,255,
+        0,3,255,
+        0,7,255,
+        0,11,255,
+        0,15,255,
+        0,19,255,
+        0,23,255,
+        0,27,255,
+        0,31,255,
+        0,35,255,
+        0,39,255,
+        0,43,255,
+        0,47,255,
+        0,51,255,
+        0,55,255,
+        0,59,255,
+        0,63,255,
+        0,67,255,
+        0,71,255,
+        0,75,255,
+        0,79,255,
+        0,83,255,
+        0,87,255,
+        0,91,255,
+        0,95,255,
+        0,99,255,
+        0,103,255,
+        0,107,255,
+        0,111,255,
+        0,115,255,
+        0,119,255,
+        0,123,255,
+        0,127,255,
+        0,131,255,
+        0,135,255,
+        0,139,255,
+        0,143,255,
+        0,147,255,
+        0,151,255,
+        0,155,255,
+        0,159,255,
+        0,163,255,
+        0,167,255,
+        0,171,255,
+        0,175,255,
+        0,179,255,
+        0,183,255,
+        0,187,255,
+        0,191,255,
+        0,195,255,
+        0,199,255,
+        0,203,255,
+        0,207,255,
+        0,211,255,
+        0,215,255,
+        0,219,255,
+        0,223,255,
+        0,227,255,
+        0,231,255,
+        0,235,255,
+        0,239,255,
+        0,243,255,
+        0,247,255,
+        0,251,255,
+        0,255,255,
+        0,255,255,
+        3,255,251,
+        7,255,247,
+        11,255,243,
+        15,255,239,
+        19,255,235,
+        23,255,231,
+        27,255,227,
+        31,255,223,
+        35,255,219,
+        39,255,215,
+        43,255,211,
+        47,255,207,
+        51,255,203,
+        55,255,199,
+        59,255,195,
+        63,255,191,
+        67,255,187,
+        71,255,183,
+        75,255,179,
+        79,255,175,
+        83,255,171,
+        87,255,167,
+        91,255,163,
+        95,255,159,
+        99,255,155,
+        103,255,151,
+        107,255,147,
+        111,255,143,
+        115,255,139,
+        119,255,135,
+        123,255,131,
+        127,255,127,
+        131,255,123,
+        135,255,119,
+        139,255,115,
+        143,255,111,
+        147,255,107,
+        151,255,103,
+        155,255,99,
+        159,255,95,
+        163,255,91,
+        167,255,87,
+        171,255,83,
+        175,255,79,
+        179,255,75,
+        183,255,71,
+        187,255,67,
+        191,255,63,
+        195,255,59,
+        199,255,55,
+        203,255,51,
+        207,255,47,
+        211,255,43,
+        215,255,39,
+        219,255,35,
+        223,255,31,
+        227,255,27,
+        231,255,23,
+        235,255,19,
+        239,255,15,
+        243,255,11,
+        247,255,7,
+        251,255,3,
+        255,255,0,
+        255,251,0,
+        255,247,0,
+        255,243,0,
+        255,239,0,
+        255,235,0,
+        255,231,0,
+        255,227,0,
+        255,223,0,
+        255,219,0,
+        255,215,0,
+        255,211,0,
+        255,207,0,
+        255,203,0,
+        255,199,0,
+        255,195,0,
+        255,191,0,
+        255,187,0,
+        255,183,0,
+        255,179,0,
+        255,175,0,
+        255,171,0,
+        255,167,0,
+        255,163,0,
+        255,159,0,
+        255,155,0,
+        255,151,0,
+        255,147,0,
+        255,143,0,
+        255,139,0,
+        255,135,0,
+        255,131,0,
+        255,127,0,
+        255,123,0,
+        255,119,0,
+        255,115,0,
+        255,111,0,
+        255,107,0,
+        255,103,0,
+        255,99,0,
+        255,95,0,
+        255,91,0,
+        255,87,0,
+        255,83,0,
+        255,79,0,
+        255,75,0,
+        255,71,0,
+        255,67,0,
+        255,63,0,
+        255,59,0,
+        255,55,0,
+        255,51,0,
+        255,47,0,
+        255,43,0,
+        255,39,0,
+        255,35,0,
+        255,31,0,
+        255,27,0,
+        255,23,0,
+        255,19,0,
+        255,15,0,
+        255,11,0,
+        255,7,0,
+        255,3,0,
+        255,0,0,
+        250,0,0,
+        246,0,0,
+        241,0,0,
+        237,0,0,
+        233,0,0,
+        228,0,0,
+        224,0,0,
+        219,0,0,
+        215,0,0,
+        211,0,0,
+        206,0,0,
+        202,0,0,
+        197,0,0,
+        193,0,0,
+        189,0,0,
+        184,0,0,
+        180,0,0,
+        175,0,0,
+        171,0,0,
+        167,0,0,
+        162,0,0,
+        158,0,0,
+        153,0,0,
+        149,0,0,
+        145,0,0,
+        140,0,0,
+        136,0,0,
+        131,0,0,
+        127,0,0
 };
+/* clang-format on */
+
+
+
+
+
+
 
diff --git a/hl/tools/gif2h5/CMakeLists.txt b/hl/tools/gif2h5/CMakeLists.txt
index 0b895a3..e165b54 100644
--- a/hl/tools/gif2h5/CMakeLists.txt
+++ b/hl/tools/gif2h5/CMakeLists.txt
@@ -40,6 +40,17 @@ if (BUILD_SHARED_LIBS)
   )
 endif ()
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_HL_TOOLS_GIF2H5_FORMAT gif2h5)
+  else ()
+    clang_format (HDF5_HL_TOOLS_GIF2H5_FORMAT gif2h5-shared)
+  endif ()
+endif ()
+
 #-- Add h52gif program
 set (hdf2gif_SOURCES
     ${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/hdf2gif.c
@@ -71,6 +82,17 @@ if (BUILD_SHARED_LIBS)
   )
 endif ()
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_HL_TOOLS_H52GIF_FORMAT h52gif)
+  else ()
+    clang_format (HDF5_HL_TOOLS_H52GIF_FORMAT h52gif-shared)
+  endif ()
+endif ()
+
 if (BUILD_TESTING AND HDF5_TEST_SERIAL)
   # --------------------------------------------------------------------
   # This executable can generate the actual test files - Currently not
@@ -84,6 +106,13 @@ if (BUILD_TESTING AND HDF5_TEST_SERIAL)
       target_link_libraries (hl_h52gifgentest PRIVATE ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
       set_target_properties (hl_h52gifgentest PROPERTIES FOLDER generator/tools/hl)
 
+      #-----------------------------------------------------------------------------
+      # Add Target to clang-format
+      #-----------------------------------------------------------------------------
+      if (HDF5_ENABLE_FORMATTERS)
+        clang_format (HDF5_HL_TOOLS_hl_h52gifgentest_FORMAT hl_h52gifgentest)
+      endif ()
+
 #      add_test (NAME hl_h52gifgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_h52gifgentest>)
   endif ()
 
diff --git a/hl/tools/h5watch/CMakeLists.txt b/hl/tools/h5watch/CMakeLists.txt
index c5ad976..7e04329 100644
--- a/hl/tools/h5watch/CMakeLists.txt
+++ b/hl/tools/h5watch/CMakeLists.txt
@@ -28,6 +28,17 @@ if (BUILD_SHARED_LIBS)
   set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5watch-shared)
 endif ()
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_HL_TOOLS_H5WATCH_FORMAT h5watch)
+  else ()
+    clang_format (HDF5_HL_TOOLS_H5WATCH_FORMAT h5watch-shared)
+  endif ()
+endif ()
+
 if (BUILD_TESTING AND HDF5_TEST_SWMR AND HDF5_TEST_SERIAL)
   #-- Add swmr_check_compat_vfd program
   set (hl_swmr_check_compat_vfd_SOURCES
@@ -45,6 +56,13 @@ if (BUILD_TESTING AND HDF5_TEST_SWMR AND HDF5_TEST_SERIAL)
   endif ()
   set_target_properties (hl_swmr_check_compat_vfd PROPERTIES FOLDER tools/hl)
 
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_HL_TOOLS_H5WATCH_hl_swmr_check_compat_vfd_FORMAT hl_swmr_check_compat_vfd)
+  endif ()
+
   #-- Add extend_dset program
   set (extend_dset_SOURCES
       ${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/extend_dset.c
@@ -61,6 +79,13 @@ if (BUILD_TESTING AND HDF5_TEST_SWMR AND HDF5_TEST_SERIAL)
   endif ()
   set_target_properties (extend_dset PROPERTIES FOLDER tools/hl)
 
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_HL_TOOLS_H5WATCH_extend_dset_FORMAT extend_dset)
+  endif ()
+
   add_executable (h5watchgentest ${HDF5_HL_TOOLS_H5WATCH_SOURCE_DIR}/h5watchgentest.c)
   target_compile_options(h5watchgentest PRIVATE "${HDF5_CMAKE_C_FLAGS}")
   target_include_directories (h5watchgentest PRIVATE "${HDF5_HL_SRC_DIR}/src;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
@@ -73,6 +98,13 @@ if (BUILD_TESTING AND HDF5_TEST_SWMR AND HDF5_TEST_SERIAL)
   endif ()
   set_target_properties (h5watchgentest PROPERTIES FOLDER generator/tools/hl)
 
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_HL_TOOLS_H5WATCH_h5watchgentest_FORMAT h5watchgentest)
+  endif ()
+
   if (HDF5_TEST_TOOLS)
     include (CMakeTests.cmake)
   endif ()