Fixed 1.6 compatibility issues and ran source formatter

12 files changed, 56 insertions, 51 deletions

diff --git a/src/H5C.c b/src/H5C.c
index 845d90b..222b836 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -531,8 +531,9 @@ H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr,
             HDfprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
                       cache_ptr->prefix, hit_rate, (cache_ptr->resize_ctl).lower_hr_threshold);
 
-            HDfprintf(stdout, "%s	cache size increased from (%Zu/%Zu) to (%Zu/%Zu).\n", cache_ptr->prefix,
-                      old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
+            HDfprintf(stdout, "%s	cache size increased from (%Zu/%Zu) to (%Zu/%Zu).\n",
+                      cache_ptr->prefix, old_max_cache_size, old_min_clean_size, new_max_cache_size,
+                      new_min_clean_size);
             break;
 
         case flash_increase:
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 9d7b025..b50f71a 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -1137,14 +1137,13 @@ H5FD__core_query(const H5FD_t *_file, unsigned long *flags /* out */)
         *flags |= H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations  */
         *flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
         *flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes    */
-        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA;          /* OK to aggregate "small" raw data allocations          */
-        *flags |= H5FD_FEAT_ALLOW_FILE_IMAGE;             /* OK to use file image feature with this VFD             */
+        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations          */
+        *flags |= H5FD_FEAT_ALLOW_FILE_IMAGE;    /* OK to use file image feature with this VFD             */
         *flags |= H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS; /* OK to use file image callbacks with this VFD */
 
         /* These feature flags are only applicable if the backing store is enabled */
         if (file && file->fd >= 0 && file->backing_store) {
-            *flags |=
-                H5FD_FEAT_POSIX_COMPAT_HANDLE; /* get_handle callback returns a POSIX file descriptor */
+            *flags |= H5FD_FEAT_POSIX_COMPAT_HANDLE; /* get_handle callback returns a POSIX file descriptor */
             *flags |= H5FD_FEAT_DEFAULT_VFD_COMPATIBLE; /* VFD creates a file which can be opened with the
                                                            default VFD      */
         }
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index c55ba6b..09e71f1 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -71,12 +71,12 @@ static const char *flavors[] = {
  * occurs), and `op' will be set to H5F_OP_UNKNOWN.
  */
 typedef struct H5FD_log_t {
-    H5FD_t         pub;                             /* public stuff, must be first      */
-    int            fd;                              /* the unix file                    */
-    haddr_t        eoa;                             /* end of allocated region          */
-    haddr_t        eof;                             /* end of file; current file size   */
-    haddr_t        pos;                             /* current file I/O position        */
-    H5FD_file_op_t op;                              /* last operation                   */
+    H5FD_t         pub; /* public stuff, must be first      */
+    int            fd;  /* the unix file                    */
+    haddr_t        eoa; /* end of allocated region          */
+    haddr_t        eof; /* end of file; current file size   */
+    haddr_t        pos; /* current file I/O position        */
+    H5FD_file_op_t op;  /* last operation                   */
     hbool_t        ignore_disabled_file_locks;
     char           filename[H5FD_MAX_FILENAME_LEN]; /* Copy of file name from open operation */
 #ifndef H5_HAVE_WIN32_API
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 7c6dc67..a5a38a6 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1905,7 +1905,7 @@ H5FD_multi_unlock(H5FD_t *_file)
     if (nerrors)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTUNLOCKFILE, "error unlocking member files", -1);
 
-            return 0;
+    return 0;
 } /* H5FD_multi_unlock() */
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index cc774d9..319089c 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -53,12 +53,12 @@ static htri_t ignore_disabled_file_locks_s = FAIL;
  * occurs), and 'op' will be set to H5F_OP_UNKNOWN.
  */
 typedef struct H5FD_sec2_t {
-    H5FD_t         pub;                             /* public stuff, must be first      */
-    int            fd;                              /* the filesystem file descriptor   */
-    haddr_t        eoa;                             /* end of allocated region          */
-    haddr_t        eof;                             /* end of file; current file size   */
-    haddr_t        pos;                             /* current file I/O position        */
-    H5FD_file_op_t op;                              /* last operation                   */
+    H5FD_t         pub; /* public stuff, must be first      */
+    int            fd;  /* the filesystem file descriptor   */
+    haddr_t        eoa; /* end of allocated region          */
+    haddr_t        eof; /* end of file; current file size   */
+    haddr_t        pos; /* current file I/O position        */
+    H5FD_file_op_t op;  /* last operation                   */
     hbool_t        ignore_disabled_file_locks;
     char           filename[H5FD_MAX_FILENAME_LEN]; /* Copy of file name from open operation */
 #ifndef H5_HAVE_WIN32_API
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 57176ce..27e187e 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -1819,7 +1819,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
     hbool_t                set_flag               = FALSE; /*set the status_flags in the superblock */
     hbool_t                clear                  = FALSE; /*clear the status_flags         */
     hbool_t                evict_on_close;                 /* evict on close value from plist  */
-    hbool_t                use_file_locking = TRUE;        /* Using file locks? */
+    hbool_t                use_file_locking    = TRUE;     /* Using file locks? */
     hbool_t                ci_load             = FALSE;    /* whether MDC ci load requested */
     hbool_t                ci_write            = FALSE;    /* whether MDC CI write requested */
     hbool_t                file_create         = FALSE;    /* creating a new file or not */
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 19a91ec..d661829 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -540,16 +540,17 @@ uint64_decode(uint8_t **pp)
 #define H5F_DEFAULT_CSET H5T_CSET_ASCII
 
 /* ========= File Creation properties ============ */
-#define H5F_CRT_USER_BLOCK_NAME          "block_size"  /* Size of the file user block in bytes */
-#define H5F_CRT_SYM_LEAF_NAME            "symbol_leaf" /* 1/2 rank for symbol table leaf nodes */
-#define H5F_CRT_SYM_LEAF_DEF             4
-#define H5F_CRT_BTREE_RANK_NAME          "btree_rank"        /* 1/2 rank for btree internal nodes    */
-#define H5F_CRT_ADDR_BYTE_NUM_NAME       "addr_byte_num"     /* Byte number in an address            */
-#define H5F_CRT_OBJ_BYTE_NUM_NAME        "obj_byte_num"      /* Byte number for object size          */
-#define H5F_CRT_SUPER_VERS_NAME          "super_version"     /* Version number of the superblock     */
-#define H5F_CRT_SHMSG_NINDEXES_NAME      "num_shmsg_indexes" /* Number of shared object header message indexes */
-#define H5F_CRT_SHMSG_INDEX_TYPES_NAME   "shmsg_message_types"   /* Types of message in each index */
-#define H5F_CRT_SHMSG_INDEX_MINSIZE_NAME "shmsg_message_minsize" /* Minimum size of messages in each index   \
+#define H5F_CRT_USER_BLOCK_NAME        "block_size"  /* Size of the file user block in bytes */
+#define H5F_CRT_SYM_LEAF_NAME          "symbol_leaf" /* 1/2 rank for symbol table leaf nodes */
+#define H5F_CRT_SYM_LEAF_DEF           4
+#define H5F_CRT_BTREE_RANK_NAME        "btree_rank"        /* 1/2 rank for btree internal nodes    */
+#define H5F_CRT_ADDR_BYTE_NUM_NAME     "addr_byte_num"     /* Byte number in an address            */
+#define H5F_CRT_OBJ_BYTE_NUM_NAME      "obj_byte_num"      /* Byte number for object size          */
+#define H5F_CRT_SUPER_VERS_NAME        "super_version"     /* Version number of the superblock     */
+#define H5F_CRT_SHMSG_NINDEXES_NAME    "num_shmsg_indexes" /* Number of shared object header message indexes */
+#define H5F_CRT_SHMSG_INDEX_TYPES_NAME "shmsg_message_types" /* Types of message in each index */
+#define H5F_CRT_SHMSG_INDEX_MINSIZE_NAME                                                                     \
+    "shmsg_message_minsize"                                      /* Minimum size of messages in each index   \
                                                                   */
 #define H5F_CRT_SHMSG_LIST_MAX_NAME       "shmsg_list_max"       /* Shared message list maximum size */
 #define H5F_CRT_SHMSG_BTREE_MIN_NAME      "shmsg_btree_min"      /* Shared message B-tree minimum size */
diff --git a/src/H5Lprivate.h b/src/H5Lprivate.h
index a5d447b..87c99b9 100644
--- a/src/H5Lprivate.h
+++ b/src/H5Lprivate.h
@@ -38,7 +38,8 @@
 /* ========  Link access property names ======== */
 #define H5L_ACS_NLINKS_NAME       "max soft links"       /* Number of soft links to traverse */
 #define H5L_ACS_ELINK_PREFIX_NAME "external link prefix" /* External link prefix */
-#define H5L_ACS_ELINK_FAPL_NAME   "external link fapl" /* file access property list for external link access \
+#define H5L_ACS_ELINK_FAPL_NAME                                                                              \
+    "external link fapl"                               /* file access property list for external link access \
                                                         */
 #define H5L_ACS_ELINK_FLAGS_NAME "external link flags" /* file access flags for external link traversal */
 #define H5L_ACS_ELINK_CB_NAME    "external link callback" /*  callback function for external link traversal */
diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h
index 8d7dd7f..b791f13 100644
--- a/src/H5Lpublic.h
+++ b/src/H5Lpublic.h
@@ -67,9 +67,10 @@ typedef enum {
     H5L_TYPE_EXTERNAL = 64,   /* External link id             */
     H5L_TYPE_MAX      = 255   /* Maximum link type id         */
 } H5L_type_t;
-#define H5L_TYPE_BUILTIN_MAX H5L_TYPE_SOFT     /* Maximum value link value for "built-in" link types */
-#define H5L_TYPE_UD_MIN      H5L_TYPE_EXTERNAL /* Link ids at or above this value are "user-defined" link types. \
-                                                */
+#define H5L_TYPE_BUILTIN_MAX H5L_TYPE_SOFT /* Maximum value link value for "built-in" link types */
+#define H5L_TYPE_UD_MIN                                                                                      \
+    H5L_TYPE_EXTERNAL /* Link ids at or above this value are "user-defined" link types.                      \
+                       */
 
 /* Information struct for link (for H5Lget_info2/H5Lget_info_by_idx2)
  * H5O_token_t version used in VOL layer and future public API calls
diff --git a/src/H5MFpkg.h b/src/H5MFpkg.h
index 20ead53..71af401 100644
--- a/src/H5MFpkg.h
+++ b/src/H5MFpkg.h
@@ -50,8 +50,9 @@
 
 /* Free-space section types for file */
 /* (values stored in free space data structures in file) */
-#define H5MF_FSPACE_SECT_SIMPLE 0 /* For non-paged aggregation: section is a range of actual bytes in file   \
-                                   */
+#define H5MF_FSPACE_SECT_SIMPLE                                                                              \
+    0 /* For non-paged aggregation: section is a range of actual bytes in file                               \
+       */
 #define H5MF_FSPACE_SECT_SMALL                                                                               \
     1 /* For paged aggregation: "small" meta/raw data section which is < fsp_size) */
 #define H5MF_FSPACE_SECT_LARGE 2 /* For paged aggregation: "large" Section which is >= fsp_size) */
diff --git a/src/H5MVpkg.h b/src/H5MVpkg.h
index 1c05da4..2d564e6 100644
--- a/src/H5MVpkg.h
+++ b/src/H5MVpkg.h
@@ -41,8 +41,9 @@
 
 /* Free-space section types for file */
 /* (values stored in free space data structures in file) */
-#define H5MV_FSPACE_SECT_SIMPLE 0 /* For non-paged aggregation: section is a range of actual bytes in file   \
-                                   */
+#define H5MV_FSPACE_SECT_SIMPLE                                                                              \
+    0 /* For non-paged aggregation: section is a range of actual bytes in file                               \
+       */
 
 /****************************/
 /* Package Private Typedefs */
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 64476db..9524dca 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -352,19 +352,19 @@ H5_DLL herr_t      H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *
 H5_DLL herr_t      H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr);
 H5_DLL herr_t      H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr);
 H5_DLL herr_t      H5Pset_file_locking(hid_t fapl_id, hbool_t use_file_locking, hbool_t ignore_when_disabled);
-H5_DLL herr_t      H5Pget_file_locking(hid_t fapl_id, hbool_t *use_file_locking, hbool_t *ignore_when_disabled);
-H5_DLL herr_t      H5Pset_core_write_tracking(hid_t fapl_id, hbool_t is_enabled, size_t page_size);
-H5_DLL herr_t      H5Pget_core_write_tracking(hid_t fapl_id, hbool_t *is_enabled, size_t *page_size);
-H5_DLL herr_t      H5Pset_metadata_read_attempts(hid_t plist_id, unsigned attempts);
-H5_DLL herr_t      H5Pget_metadata_read_attempts(hid_t plist_id, unsigned *attempts);
-H5_DLL herr_t      H5Pset_object_flush_cb(hid_t plist_id, H5F_flush_cb_t func, void *udata);
-H5_DLL herr_t      H5Pget_object_flush_cb(hid_t plist_id, H5F_flush_cb_t *func, void **udata);
-H5_DLL herr_t      H5Pset_mdc_log_options(hid_t plist_id, hbool_t is_enabled, const char *location,
-                                          hbool_t start_on_access);
-H5_DLL herr_t      H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled, char *location,
-                                          size_t *location_size, hbool_t *start_on_access);
-H5_DLL herr_t      H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close);
-H5_DLL herr_t      H5Pget_evict_on_close(hid_t fapl_id, hbool_t *evict_on_close);
+H5_DLL herr_t H5Pget_file_locking(hid_t fapl_id, hbool_t *use_file_locking, hbool_t *ignore_when_disabled);
+H5_DLL herr_t H5Pset_core_write_tracking(hid_t fapl_id, hbool_t is_enabled, size_t page_size);
+H5_DLL herr_t H5Pget_core_write_tracking(hid_t fapl_id, hbool_t *is_enabled, size_t *page_size);
+H5_DLL herr_t H5Pset_metadata_read_attempts(hid_t plist_id, unsigned attempts);
+H5_DLL herr_t H5Pget_metadata_read_attempts(hid_t plist_id, unsigned *attempts);
+H5_DLL herr_t H5Pset_object_flush_cb(hid_t plist_id, H5F_flush_cb_t func, void *udata);
+H5_DLL herr_t H5Pget_object_flush_cb(hid_t plist_id, H5F_flush_cb_t *func, void **udata);
+H5_DLL herr_t H5Pset_mdc_log_options(hid_t plist_id, hbool_t is_enabled, const char *location,
+                                     hbool_t start_on_access);
+H5_DLL herr_t H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled, char *location,
+                                     size_t *location_size, hbool_t *start_on_access);
+H5_DLL herr_t H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close);
+H5_DLL herr_t H5Pget_evict_on_close(hid_t fapl_id, hbool_t *evict_on_close);
 #ifdef H5_HAVE_PARALLEL
 H5_DLL herr_t H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective);
 H5_DLL herr_t H5Pget_all_coll_metadata_ops(hid_t plist_id, hbool_t *is_collective);