Merge pull request #2903 in HDFFV/hdf5 from ~BYRN/hdf5_clang_format:hdf5_1_12 to hdf5_1_12

* commit '3088c6abec27ad477031a71d947ac3be4cb2429d':
  define name
  warning format fixes and define name from develop
  Src file format preventive updates
  Add clang-format changes from develop.

2 files changed, 17 insertions, 4 deletions

diff --git a/tools/src/h5diff/CMakeLists.txt b/tools/src/h5diff/CMakeLists.txt
index 4087ab4..f18b358 100644
--- a/tools/src/h5diff/CMakeLists.txt
+++ b/tools/src/h5diff/CMakeLists.txt
@@ -8,6 +8,7 @@ if (NOT ONLY_SHARED_LIBS)
   add_executable (h5diff
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
+      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.h
   )
   target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   target_compile_options(h5diff PRIVATE "${HDF5_CMAKE_C_FLAGS}")
@@ -23,6 +24,7 @@ if (BUILD_SHARED_LIBS)
   add_executable (h5diff-shared
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
+      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.h
   )
   target_include_directories (h5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   target_compile_options(h5diff-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
@@ -35,6 +37,17 @@ if (BUILD_SHARED_LIBS)
   set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5diff-shared)
 endif ()
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_H5DIFF_SRC_FORMAT h5diff)
+  else ()
+    clang_format (HDF5_H5DIFF_SRC_FORMAT h5diff-shared)
+  endif ()
+endif ()
+
 if (H5_HAVE_PARALLEL)
   if (NOT ONLY_SHARED_LIBS)
     add_executable (ph5diff
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index 8ed2d37..a381711 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -75,7 +75,7 @@ static void check_options(diff_opt_t* opts)
     }
 }
 
-#if TRILABS-227
+#if TRILABS_227
 /*-------------------------------------------------------------------------
  * Function:    parse_hsize_list
  *
@@ -478,10 +478,10 @@ void parse_command_line(int argc, const char* argv[], const char** fname1, const
     H5TOOLS_DEBUG("objname2 = %s", *objname2);
 
     /*
-     * TRILABS-227 is complete except for an issue with printing indices
+     * TRILABS_227 is complete except for an issue with printing indices
      * the following calls will enable subsetting
     */
-#if TRILABS-227
+#if TRILABS_227
     opts->sset[0] = parse_subset_params(*objname1);
 
     opts->sset[1] = parse_subset_params(*objname2);
@@ -762,7 +762,7 @@ void usage(void)
  PRINTVALSTREAM(rawoutstream, "       symbolic links are compared.).\n");
  PRINTVALSTREAM(rawoutstream, "\n");
  /*
-  * TRILABS-227 is complete except for an issue with printing indices
+  * TRILABS_227 is complete except for an issue with printing indices
   * the following will be needed for subsetting
  PRINTVALSTREAM(rawoutstream, " Subsetting options:\n");
  PRINTVALSTREAM(rawoutstream, "  Subsetting is available by using the fcompact form of subsetting, as follows:\n");