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

1 files changed, 28 insertions, 28 deletions

diff --git a/src/H5public.h b/src/H5public.h
index a4b90b6..97176ab 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -26,28 +26,28 @@
  * it via H5public.h.  The #ifndef _H5public_H guard above would
  * prevent repeated include.
  */
-#include "H5pubconf.h"        /*from configure                             */
+#include "H5pubconf.h"          /* From configure */
 
 /* API Version macro wrapper definitions */
 #include "H5version.h"
 
 #ifdef H5_HAVE_FEATURES_H
-#include <features.h>           /*for setting POSIX, BSD, etc. compatibility */
+#include <features.h>           /* For setting POSIX, BSD, etc. compatibility */
 #endif
 #ifdef H5_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef H5_STDC_HEADERS
-#   include <limits.h>        /*for H5T_NATIVE_CHAR defn in H5Tpublic.h    */
-#   include <stdarg.h>      /*for variadic functions in H5VLpublic.h     */
+#   include <limits.h>          /* For H5T_NATIVE_CHAR defn in H5Tpublic.h  */
+#   include <stdarg.h>          /* For variadic functions in H5VLpublic.h   */
 #endif
 #ifndef __cplusplus
 # ifdef H5_HAVE_STDINT_H
-#   include <stdint.h>        /*for C9x types                     */
+#   include <stdint.h>          /* For C9x types */
 # endif
 #else
 # ifdef H5_HAVE_STDINT_H_CXX
-#   include <stdint.h>        /*for C9x types    when include from C++         */
+#   include <stdint.h>          /* For C9x types (when included from C++) */
 # endif
 #endif
 #ifdef H5_HAVE_INTTYPES_H
@@ -61,7 +61,7 @@
 #   define MPICH_SKIP_MPICXX 1
 #   define OMPI_SKIP_MPICXX 1
 #   include <mpi.h>
-#ifndef MPI_FILE_NULL        /*MPIO may be defined in mpi.h already       */
+#ifndef MPI_FILE_NULL           /* MPIO may be defined in mpi.h already */
 #   include <mpio.h>
 #endif
 #endif
@@ -94,14 +94,14 @@ extern "C" {
 #endif
 
 /* Version numbers */
-#define H5_VERS_MAJOR    1    /* For major interface/format changes           */
-#define H5_VERS_MINOR    13    /* For minor interface/format changes           */
-#define H5_VERS_RELEASE    0    /* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE ""    /* For pre-releases like snap0       */
+#define H5_VERS_MAJOR   1   /* For major interface/format changes       */
+#define H5_VERS_MINOR   13  /* For minor interface/format changes       */
+#define H5_VERS_RELEASE 0   /* For tweaks, bug-fixes, or development    */
+#define H5_VERS_SUBRELEASE ""   /* For pre-releases like snap0          */
                 /* Empty string for real releases.           */
 #define H5_VERS_INFO    "HDF5 library version: 1.13.0"      /* Full version string */
 
-#define H5check()    H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,          \
+#define H5check()   H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,            \
                         H5_VERS_RELEASE)
 
 /* macros for comparing the version */
@@ -122,8 +122,8 @@ extern "C" {
  * The negative failure value is most commonly -1, but don't bet on it.  The
  * proper way to detect failure is something like:
  *
- *     if((dset = H5Dopen2(file, name)) < 0)
- *        fprintf(stderr, "unable to open the requested dataset\n");
+ *  if((dset = H5Dopen2(file, name)) < 0)
+ *      fprintf(stderr, "unable to open the requested dataset\n");
  */
 typedef int herr_t;
 
@@ -135,13 +135,13 @@ typedef int herr_t;
  * (false), positive (true), or negative (failure). The proper way to test
  * for truth from a htri_t function is:
  *
- *     if ((retval = H5Tcommitted(type))>0) {
- *        printf("data type is committed\n");
- *    } else if (!retval) {
- *         printf("data type is not committed\n");
- *    } else {
- *         printf("error determining whether data type is committed\n");
- *    }
+ *  if ((retval = H5Tcommitted(type)) > 0) {
+ *      printf("data type is committed\n");
+ *  } else if (!retval) {
+ *      printf("data type is not committed\n");
+ *  } else {
+ *      printf("error determining whether data type is committed\n");
+ *  }
  */
 #ifdef H5_HAVE_STDBOOL_H
   #include <stdbool.h>
@@ -285,10 +285,10 @@ typedef int64_t     hssize_t;
 #   define PRIxHADDR  H5_PRINTF_LL_WIDTH "x"
 #   define PRIXHADDR  H5_PRINTF_LL_WIDTH "X"
 #else
-#   error "nothing appropriate for H5_PRINTF_HADDR_FMT"
+#   error "nothing appropriate for PRI.HADDR"
 #endif
 #define H5_PRINTF_HADDR_FMT  "%" PRIuHADDR
-#define HADDR_MAX        (HADDR_UNDEF-1)
+#define HADDR_MAX       (HADDR_UNDEF-1)
 
 /* uint32_t type is used for creation order field for messages.  It may be
  * defined in Posix.1g, otherwise it is defined here.
@@ -316,7 +316,7 @@ typedef enum {
     H5_ITER_INC,                /* Increasing order */
     H5_ITER_DEC,                /* Decreasing order */
     H5_ITER_NATIVE,             /* No particular order, whatever is fastest */
-    H5_ITER_N                /* Number of iteration orders */
+    H5_ITER_N                   /* Number of iteration orders */
 } H5_iter_order_t;
 
 /* Iteration callback values */
@@ -333,10 +333,10 @@ typedef enum {
  * links in groups/attributes on objects.
  */
 typedef enum H5_index_t {
-    H5_INDEX_UNKNOWN = -1,    /* Unknown index type            */
-    H5_INDEX_NAME,        /* Index on names             */
-    H5_INDEX_CRT_ORDER,        /* Index on creation order         */
-    H5_INDEX_N            /* Number of indices defined         */
+    H5_INDEX_UNKNOWN = -1,      /* Unknown index type                   */
+    H5_INDEX_NAME,              /* Index on names                       */
+    H5_INDEX_CRT_ORDER,         /* Index on creation order              */
+    H5_INDEX_N                  /* Number of indices defined            */
 } H5_index_t;
 
 /*