Update reformatting settings, trace wrapping, and printf-format strings (#22)

* Add BEGIN_FUNC / CATCH / END_FUNC to macros

* Remove incorrect trailing '{'

* Update trace script to wrap H5TRACE macros at 110 characters and improve
comments for code that performs this operation.

* Clean up printf-formatting in H5public.h and correct some oversights in the code.

* Reformat with BEGIN_FUNC / END_FUNC handled correctly by clang-format

* Run clang-format on changes.

* Correct H5_SIZEOF_HSIZE_T/H5_SIZEOF_HSSIZE_T macros to match typedef.

* And make the undef value match also.

* Update comment

* Update clang-format actions to exclude generated files.

* Post-process generated H5LTparse.h file as well as H5LTparse.c file.

* Fix formatting

* Update version of github clang-format action

1 files changed, 31 insertions, 31 deletions

diff --git a/src/H5public.h b/src/H5public.h
index ced15f3..5b9a5fe 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -218,20 +218,26 @@ typedef unsigned long long uint64_t;
 #endif
 
 /*
- * The sizes of file objects have their own types defined here, use a 64-bit
- * type.
+ * The sizes of file objects have their own types defined here, use a minimum
+ * 64-bit type.
  */
-typedef uint64_t hsize_t;
-typedef int64_t  hssize_t;
-#define PRIdHSIZE          PRId64
-#define PRIiHSIZE          PRIi64
-#define PRIoHSIZE          PRIo64
-#define PRIuHSIZE          PRIu64
-#define PRIxHSIZE          PRIx64
-#define PRIXHSIZE          PRIX64
-#define H5_SIZEOF_HSIZE_T  H5_SIZEOF_UINT64_T
-#define H5_SIZEOF_HSSIZE_T H5_SIZEOF_INT64_T
-#define HSIZE_UNDEF        UINT64_MAX
+#if H5_SIZEOF_LONG_LONG >= 8
+H5_GCC_DIAG_OFF("long-long")
+typedef unsigned long long hsize_t;
+typedef signed long long   hssize_t;
+H5_GCC_DIAG_ON("long-long")
+#define PRIdHSIZE          H5_PRINTF_LL_WIDTH "d"
+#define PRIiHSIZE          H5_PRINTF_LL_WIDTH "i"
+#define PRIoHSIZE          H5_PRINTF_LL_WIDTH "o"
+#define PRIuHSIZE          H5_PRINTF_LL_WIDTH "u"
+#define PRIxHSIZE          H5_PRINTF_LL_WIDTH "x"
+#define PRIXHSIZE          H5_PRINTF_LL_WIDTH "X"
+#define H5_SIZEOF_HSIZE_T  H5_SIZEOF_LONG_LONG
+#define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
+#define HSIZE_UNDEF        ULLONG_MAX
+#else
+#error "nothing appropriate for hsize_t"
+#endif
 
 /*
  * File addresses have their own types.
@@ -243,6 +249,11 @@ typedef unsigned haddr_t;
 #ifdef H5_HAVE_PARALLEL
 #define HADDR_AS_MPI_TYPE MPI_UNSIGNED
 #endif /* H5_HAVE_PARALLEL */
+#define PRIdHADDR "d"
+#define PRIoHADDR "o"
+#define PRIuHADDR "u"
+#define PRIxHADDR "x"
+#define PRIXHADDR "X"
 #elif H5_SIZEOF_LONG >= 8
 typedef unsigned long haddr_t;
 #define HADDR_UNDEF       ULONG_MAX
@@ -250,6 +261,11 @@ typedef unsigned long haddr_t;
 #ifdef H5_HAVE_PARALLEL
 #define HADDR_AS_MPI_TYPE MPI_UNSIGNED_LONG
 #endif /* H5_HAVE_PARALLEL */
+#define PRIdHADDR "ld"
+#define PRIoHADDR "lo"
+#define PRIuHADDR "lu"
+#define PRIxHADDR "lx"
+#define PRIXHADDR "lX"
 #elif H5_SIZEOF_LONG_LONG >= 8
 typedef unsigned long long haddr_t;
 #define HADDR_UNDEF       ULLONG_MAX
@@ -257,29 +273,13 @@ typedef unsigned long long haddr_t;
 #ifdef H5_HAVE_PARALLEL
 #define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT
 #endif /* H5_HAVE_PARALLEL */
-#else
-#error "nothing appropriate for haddr_t"
-#endif
-#if H5_SIZEOF_HADDR_T == H5_SIZEOF_INT
-#define PRIXHADDR "X"
-#define PRIoHADDR "o"
-#define PRIuHADDR "u"
-#define PRIxHADDR "x"
-#define PRIXHADDR "X"
-#elif H5_SIZEOF_HADDR_T == H5_SIZEOF_LONG
-#define PRIXHADDR "lX"
-#define PRIoHADDR "lo"
-#define PRIuHADDR "lu"
-#define PRIxHADDR "lx"
-#define PRIXHADDR "lX"
-#elif H5_SIZEOF_HADDR_T == H5_SIZEOF_LONG_LONG
-#define PRIXHADDR H5_PRINTF_LL_WIDTH "X"
+#define PRIdHADDR H5_PRINTF_LL_WIDTH "d"
 #define PRIoHADDR H5_PRINTF_LL_WIDTH "o"
 #define PRIuHADDR H5_PRINTF_LL_WIDTH "u"
 #define PRIxHADDR H5_PRINTF_LL_WIDTH "x"
 #define PRIXHADDR H5_PRINTF_LL_WIDTH "X"
 #else
-#error "nothing appropriate for PRI.HADDR"
+#error "nothing appropriate for haddr_t"
 #endif
 #define H5_PRINTF_HADDR_FMT "%" PRIuHADDR
 #define HADDR_MAX           (HADDR_UNDEF - 1)