Clang-format of source files

1 files changed, 360 insertions, 388 deletions

diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c
index b576aec..bd6be75 100644
--- a/src/H5Pocpl.c
+++ b/src/H5Pocpl.c
@@ -26,22 +26,20 @@
 /* Module Setup */
 /****************/
 
-#define H5O_FRIEND              /*suppress error about including H5Opkg      */
-#include "H5Pmodule.h"          /* This source code file is part of the H5P module */
-
+#define H5O_FRIEND     /*suppress error about including H5Opkg      */
+#include "H5Pmodule.h" /* This source code file is part of the H5P module */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"         /* Generic Functions */
-#include "H5Eprivate.h"        /* Error handling    */
-#include "H5Iprivate.h"        /* IDs               */
-#include "H5MMprivate.h"       /* Memory management */
-#include "H5Opkg.h"            /* Object headers    */
-#include "H5Ppkg.h"            /* Property lists    */
-#include "H5PLprivate.h"       /* Dynamic plugin    */
-#include "H5Zprivate.h"        /* Filter pipeline   */
-
+#include "H5private.h"   /* Generic Functions */
+#include "H5Eprivate.h"  /* Error handling    */
+#include "H5Iprivate.h"  /* IDs               */
+#include "H5MMprivate.h" /* Memory management */
+#include "H5Opkg.h"      /* Object headers    */
+#include "H5Ppkg.h"      /* Property lists    */
+#include "H5PLprivate.h" /* Dynamic plugin    */
+#include "H5Zprivate.h"  /* Filter pipeline   */
 
 /****************/
 /* Local Macros */
@@ -49,39 +47,36 @@
 
 /* ========= Object Creation properties ============ */
 /* Definitions for the max. # of attributes to store compactly */
-#define H5O_CRT_ATTR_MAX_COMPACT_SIZE   sizeof(unsigned)
-#define H5O_CRT_ATTR_MAX_COMPACT_ENC    H5P__encode_unsigned
-#define H5O_CRT_ATTR_MAX_COMPACT_DEC    H5P__decode_unsigned
+#define H5O_CRT_ATTR_MAX_COMPACT_SIZE sizeof(unsigned)
+#define H5O_CRT_ATTR_MAX_COMPACT_ENC  H5P__encode_unsigned
+#define H5O_CRT_ATTR_MAX_COMPACT_DEC  H5P__decode_unsigned
 /* Definitions for the min. # of attributes to store densely */
-#define H5O_CRT_ATTR_MIN_DENSE_SIZE     sizeof(unsigned)
-#define H5O_CRT_ATTR_MIN_DENSE_ENC      H5P__encode_unsigned
-#define H5O_CRT_ATTR_MIN_DENSE_DEC      H5P__decode_unsigned
+#define H5O_CRT_ATTR_MIN_DENSE_SIZE sizeof(unsigned)
+#define H5O_CRT_ATTR_MIN_DENSE_ENC  H5P__encode_unsigned
+#define H5O_CRT_ATTR_MIN_DENSE_DEC  H5P__decode_unsigned
 /* Definitions for object header flags */
-#define H5O_CRT_OHDR_FLAGS_SIZE         sizeof(uint8_t)
-#define H5O_CRT_OHDR_FLAGS_ENC          H5P__encode_uint8_t
-#define H5O_CRT_OHDR_FLAGS_DEC          H5P__decode_uint8_t
+#define H5O_CRT_OHDR_FLAGS_SIZE sizeof(uint8_t)
+#define H5O_CRT_OHDR_FLAGS_ENC  H5P__encode_uint8_t
+#define H5O_CRT_OHDR_FLAGS_DEC  H5P__decode_uint8_t
 /* Definitions for filter pipeline */
-#define H5O_CRT_PIPELINE_SIZE sizeof(H5O_pline_t)
-#define H5O_CRT_PIPELINE_SET            H5P__ocrt_pipeline_set
-#define H5O_CRT_PIPELINE_GET            H5P__ocrt_pipeline_get
-#define H5O_CRT_PIPELINE_ENC            H5P__ocrt_pipeline_enc
-#define H5O_CRT_PIPELINE_DEC            H5P__ocrt_pipeline_dec
-#define H5O_CRT_PIPELINE_DEL            H5P__ocrt_pipeline_del
-#define H5O_CRT_PIPELINE_COPY           H5P__ocrt_pipeline_copy
-#define H5O_CRT_PIPELINE_CMP            H5P__ocrt_pipeline_cmp
-#define H5O_CRT_PIPELINE_CLOSE          H5P__ocrt_pipeline_close
-
+#define H5O_CRT_PIPELINE_SIZE  sizeof(H5O_pline_t)
+#define H5O_CRT_PIPELINE_SET   H5P__ocrt_pipeline_set
+#define H5O_CRT_PIPELINE_GET   H5P__ocrt_pipeline_get
+#define H5O_CRT_PIPELINE_ENC   H5P__ocrt_pipeline_enc
+#define H5O_CRT_PIPELINE_DEC   H5P__ocrt_pipeline_dec
+#define H5O_CRT_PIPELINE_DEL   H5P__ocrt_pipeline_del
+#define H5O_CRT_PIPELINE_COPY  H5P__ocrt_pipeline_copy
+#define H5O_CRT_PIPELINE_CMP   H5P__ocrt_pipeline_cmp
+#define H5O_CRT_PIPELINE_CLOSE H5P__ocrt_pipeline_close
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -96,12 +91,12 @@ static herr_t H5P__ocrt_pipeline_set(hid_t prop_id, const char *name, size_t siz
 static herr_t H5P__ocrt_pipeline_get(hid_t prop_id, const char *name, size_t size, void *value);
 static herr_t H5P__ocrt_pipeline_del(hid_t prop_id, const char *name, size_t size, void *value);
 static herr_t H5P__ocrt_pipeline_copy(const char *name, size_t size, void *value);
-static int H5P__ocrt_pipeline_cmp(const void *value1, const void *value2, size_t size);
+static int    H5P__ocrt_pipeline_cmp(const void *value1, const void *value2, size_t size);
 static herr_t H5P__ocrt_pipeline_close(const char *name, size_t size, void *value);
 
 /* Local routines */
-static herr_t H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter,
-    unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/]);
+static herr_t H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned int flags,
+                              size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/]);
 
 /*********************/
 /* Package Variables */
@@ -109,42 +104,39 @@ static herr_t H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter,
 
 /* Object creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_OCRT[1] = {{
-    "object create",                /* Class name for debugging     */
-    H5P_TYPE_OBJECT_CREATE,         /* Class type                   */
-
-    &H5P_CLS_ROOT_g,                /* Parent class                 */
-    &H5P_CLS_OBJECT_CREATE_g,       /* Pointer to class             */
-    &H5P_CLS_OBJECT_CREATE_ID_g,    /* Pointer to class ID          */
-    NULL,                           /* Pointer to default property list ID   */
-    H5P__ocrt_reg_prop,             /* Default property registration routine */
-
-    NULL,                           /* Class creation callback      */
-    NULL,                           /* Class creation callback info */
-    NULL,                           /* Class copy callback          */
-    NULL,                           /* Class copy callback info     */
-    NULL,                           /* Class close callback         */
-    NULL                            /* Class close callback info    */
+    "object create",        /* Class name for debugging     */
+    H5P_TYPE_OBJECT_CREATE, /* Class type                   */
+
+    &H5P_CLS_ROOT_g,             /* Parent class                 */
+    &H5P_CLS_OBJECT_CREATE_g,    /* Pointer to class             */
+    &H5P_CLS_OBJECT_CREATE_ID_g, /* Pointer to class ID          */
+    NULL,                        /* Pointer to default property list ID   */
+    H5P__ocrt_reg_prop,          /* Default property registration routine */
+
+    NULL, /* Class creation callback      */
+    NULL, /* Class creation callback info */
+    NULL, /* Class copy callback          */
+    NULL, /* Class copy callback info     */
+    NULL, /* Class close callback         */
+    NULL  /* Class close callback info    */
 }};
 
-
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Property value defaults */
-static const unsigned H5O_def_attr_max_compact_g = H5O_CRT_ATTR_MAX_COMPACT_DEF;   /* Default max. compact attribute storage settings */
-static const unsigned H5O_def_attr_min_dense_g = H5O_CRT_ATTR_MIN_DENSE_DEF;       /* Default min. dense attribute storage settings */
-static const uint8_t H5O_def_ohdr_flags_g = H5O_CRT_OHDR_FLAGS_DEF;        /* Default object header flag settings */
-static const H5O_pline_t H5O_def_pline_g = H5O_CRT_PIPELINE_DEF;           /* Default I/O pipeline setting */
-
+static const unsigned H5O_def_attr_max_compact_g =
+    H5O_CRT_ATTR_MAX_COMPACT_DEF; /* Default max. compact attribute storage settings */
+static const unsigned H5O_def_attr_min_dense_g =
+    H5O_CRT_ATTR_MIN_DENSE_DEF; /* Default min. dense attribute storage settings */
+static const uint8_t H5O_def_ohdr_flags_g = H5O_CRT_OHDR_FLAGS_DEF; /* Default object header flag settings */
+static const H5O_pline_t H5O_def_pline_g  = H5O_CRT_PIPELINE_DEF;   /* Default I/O pipeline setting */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__ocrt_reg_prop
  *
@@ -160,39 +152,39 @@ static const H5O_pline_t H5O_def_pline_g = H5O_CRT_PIPELINE_DEF;           /* De
 static herr_t
 H5P__ocrt_reg_prop(H5P_genclass_t *pclass)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Register max. compact attribute storage property */
-    if(H5P__register_real(pclass, H5O_CRT_ATTR_MAX_COMPACT_NAME, H5O_CRT_ATTR_MAX_COMPACT_SIZE, &H5O_def_attr_max_compact_g,
-            NULL, NULL, NULL, H5O_CRT_ATTR_MAX_COMPACT_ENC, H5O_CRT_ATTR_MAX_COMPACT_DEC,
-            NULL, NULL, NULL, NULL) < 0)
+    if (H5P__register_real(pclass, H5O_CRT_ATTR_MAX_COMPACT_NAME, H5O_CRT_ATTR_MAX_COMPACT_SIZE,
+                           &H5O_def_attr_max_compact_g, NULL, NULL, NULL, H5O_CRT_ATTR_MAX_COMPACT_ENC,
+                           H5O_CRT_ATTR_MAX_COMPACT_DEC, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register min. dense attribute storage property */
-    if(H5P__register_real(pclass, H5O_CRT_ATTR_MIN_DENSE_NAME, H5O_CRT_ATTR_MIN_DENSE_SIZE, &H5O_def_attr_min_dense_g,
-            NULL, NULL, NULL, H5O_CRT_ATTR_MIN_DENSE_ENC, H5O_CRT_ATTR_MIN_DENSE_DEC,
-            NULL, NULL, NULL, NULL) < 0)
+    if (H5P__register_real(pclass, H5O_CRT_ATTR_MIN_DENSE_NAME, H5O_CRT_ATTR_MIN_DENSE_SIZE,
+                           &H5O_def_attr_min_dense_g, NULL, NULL, NULL, H5O_CRT_ATTR_MIN_DENSE_ENC,
+                           H5O_CRT_ATTR_MIN_DENSE_DEC, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register object header flags property */
-    if(H5P__register_real(pclass, H5O_CRT_OHDR_FLAGS_NAME, H5O_CRT_OHDR_FLAGS_SIZE, &H5O_def_ohdr_flags_g,
-            NULL, NULL, NULL, H5O_CRT_OHDR_FLAGS_ENC, H5O_CRT_OHDR_FLAGS_DEC,
-            NULL, NULL, NULL, NULL) < 0)
+    if (H5P__register_real(pclass, H5O_CRT_OHDR_FLAGS_NAME, H5O_CRT_OHDR_FLAGS_SIZE, &H5O_def_ohdr_flags_g,
+                           NULL, NULL, NULL, H5O_CRT_OHDR_FLAGS_ENC, H5O_CRT_OHDR_FLAGS_DEC, NULL, NULL, NULL,
+                           NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the pipeline property */
-    if(H5P__register_real(pclass, H5O_CRT_PIPELINE_NAME, H5O_CRT_PIPELINE_SIZE, &H5O_def_pline_g,
-            NULL, H5O_CRT_PIPELINE_SET, H5O_CRT_PIPELINE_GET, H5O_CRT_PIPELINE_ENC, H5O_CRT_PIPELINE_DEC,
-            H5O_CRT_PIPELINE_DEL, H5O_CRT_PIPELINE_COPY, H5O_CRT_PIPELINE_CMP, H5O_CRT_PIPELINE_CLOSE) < 0)
+    if (H5P__register_real(pclass, H5O_CRT_PIPELINE_NAME, H5O_CRT_PIPELINE_SIZE, &H5O_def_pline_g, NULL,
+                           H5O_CRT_PIPELINE_SET, H5O_CRT_PIPELINE_GET, H5O_CRT_PIPELINE_ENC,
+                           H5O_CRT_PIPELINE_DEC, H5O_CRT_PIPELINE_DEL, H5O_CRT_PIPELINE_COPY,
+                           H5O_CRT_PIPELINE_CMP, H5O_CRT_PIPELINE_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_reg_prop() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_attr_phase_change
  *
@@ -218,35 +210,34 @@ done:
 herr_t
 H5Pset_attr_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dense)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iIuIu", plist_id, max_compact, min_dense);
 
     /* Range check values */
-    if(max_compact < min_dense)
+    if (max_compact < min_dense)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "max compact value must be >= min dense value")
-    if(max_compact > 65535)
+    if (max_compact > 65535)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "max compact value must be < 65536")
-    if(min_dense > 65535)
+    if (min_dense > 65535)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "min dense value must be < 65536")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set property values */
-    if(H5P_set(plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &max_compact) < 0)
+    if (H5P_set(plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &max_compact) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set max. # of compact attributes in property list")
-    if(H5P_set(plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &min_dense) < 0)
+    if (H5P_set(plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &min_dense) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set min. # of dense attributes in property list")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_attr_phase_change */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_attr_phase_change
  *
@@ -262,23 +253,23 @@ done:
 herr_t
 H5Pget_attr_phase_change(hid_t plist_id, unsigned *max_compact, unsigned *min_dense)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*Iu*Iu", plist_id, max_compact, min_dense);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get values */
-    if(max_compact) {
-        if(H5P_get(plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, max_compact) < 0)
+    if (max_compact) {
+        if (H5P_get(plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, max_compact) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get max. # of compact attributes")
     } /* end if */
-    if(min_dense) {
-        if(H5P_get(plist, H5O_CRT_ATTR_MIN_DENSE_NAME, min_dense) < 0)
+    if (min_dense) {
+        if (H5P_get(plist, H5O_CRT_ATTR_MIN_DENSE_NAME, min_dense) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get min. # of dense attributes")
     } /* end if */
 
@@ -286,7 +277,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_attr_phase_change() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_attr_creation_order
  *
@@ -302,41 +292,42 @@ done:
 herr_t
 H5Pset_attr_creation_order(hid_t plist_id, unsigned crt_order_flags)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    uint8_t ohdr_flags;                 /* Object header flags */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    uint8_t         ohdr_flags;          /* Object header flags */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, crt_order_flags);
 
     /* Check for bad combination of flags */
-    if(!(crt_order_flags & H5P_CRT_ORDER_TRACKED) && (crt_order_flags & H5P_CRT_ORDER_INDEXED))
+    if (!(crt_order_flags & H5P_CRT_ORDER_TRACKED) && (crt_order_flags & H5P_CRT_ORDER_INDEXED))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "tracking creation order is required for index")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get object header flags */
-    if(H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+    if (H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags")
 
     /* Mask off previous attribute creation order flag settings */
-    ohdr_flags &= (uint8_t)~(H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED);
+    ohdr_flags &= (uint8_t) ~(H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED);
 
     /* Update with new attribute creation order flags */
-    ohdr_flags = (uint8_t)(ohdr_flags | ((crt_order_flags & H5P_CRT_ORDER_TRACKED) ? H5O_HDR_ATTR_CRT_ORDER_TRACKED : 0));
-    ohdr_flags = (uint8_t)(ohdr_flags | ((crt_order_flags & H5P_CRT_ORDER_INDEXED) ? H5O_HDR_ATTR_CRT_ORDER_INDEXED : 0));
+    ohdr_flags = (uint8_t)(ohdr_flags |
+                           ((crt_order_flags & H5P_CRT_ORDER_TRACKED) ? H5O_HDR_ATTR_CRT_ORDER_TRACKED : 0));
+    ohdr_flags = (uint8_t)(ohdr_flags |
+                           ((crt_order_flags & H5P_CRT_ORDER_INDEXED) ? H5O_HDR_ATTR_CRT_ORDER_INDEXED : 0));
 
     /* Set object header flags */
-    if(H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+    if (H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set object header flags")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_attr_creation_order() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_attr_creation_order
  *
@@ -353,25 +344,25 @@ done:
 herr_t
 H5Pget_attr_creation_order(hid_t plist_id, unsigned *crt_order_flags)
 {
-    herr_t ret_value = SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Iu", plist_id, crt_order_flags);
 
     /* Get values */
-    if(crt_order_flags) {
+    if (crt_order_flags) {
         H5P_genplist_t *plist;      /* Property list pointer */
-        uint8_t ohdr_flags;         /* Object header flags */
+        uint8_t         ohdr_flags; /* Object header flags */
 
         /* Reset the value to return */
         *crt_order_flags = 0;
 
         /* Get the plist structure */
-        if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Get object header flags */
-        if(H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+        if (H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags")
 
         /* Set creation order flags to return */
@@ -383,7 +374,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_attr_creation_order() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_obj_track_times
  *
@@ -413,19 +403,19 @@ done:
 herr_t
 H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    uint8_t ohdr_flags;                 /* Object header flags */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    uint8_t         ohdr_flags;          /* Object header flags */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ib", plist_id, track_times);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get object header flags */
-    if(H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+    if (H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags")
 
     /* Mask off previous time tracking flag settings */
@@ -435,14 +425,13 @@ H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times)
     ohdr_flags = (uint8_t)(ohdr_flags | (track_times ? H5O_HDR_STORE_TIMES : 0));
 
     /* Set object header flags */
-    if(H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+    if (H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set object header flags")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_obj_track_times() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_obj_track_times
  *
@@ -458,22 +447,22 @@ done:
 herr_t
 H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times)
 {
-    herr_t ret_value = SUCCEED;   /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*b", plist_id, track_times);
 
     /* Get values */
-    if(track_times) {
+    if (track_times) {
         H5P_genplist_t *plist;      /* Property list pointer */
-        uint8_t ohdr_flags;         /* Object header flags */
+        uint8_t         ohdr_flags; /* Object header flags */
 
         /* Get the plist structure */
-        if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+        if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Get object header flags */
-        if(H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+        if (H5P_get(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags")
 
         /* Set track times flag to return */
@@ -484,7 +473,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_obj_track_times() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_modify_filter
  *
@@ -522,31 +510,30 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5P_modify_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned flags,
-    size_t cd_nelmts, const unsigned cd_values[/*cd_nelmts*/])
+H5P_modify_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned flags, size_t cd_nelmts,
+                  const unsigned cd_values[/*cd_nelmts*/])
 {
-    H5O_pline_t         pline;
-    herr_t ret_value = SUCCEED;   /* return value */
+    H5O_pline_t pline;
+    herr_t      ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get the pipeline property to modify */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Modify the filter parameters of the I/O pipeline */
-    if(H5Z_modify(&pline, filter, flags, cd_nelmts, cd_values) < 0)
+    if (H5Z_modify(&pline, filter, flags, cd_nelmts, cd_values) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add filter to pipeline")
 
     /* Put the I/O pipeline information back into the property list */
-    if(H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_modify_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pmodify_filter
  *
@@ -584,37 +571,35 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags,
-               size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/])
+H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+                 const unsigned int cd_values[/*cd_nelmts*/])
 {
-    H5P_genplist_t  *plist;                 /* Property list */
-    herr_t          ret_value = SUCCEED;    /* return value */
+    H5P_genplist_t *plist;               /* Property list */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values);
 
     /* Check args */
-    if (filter<0 || filter>H5Z_FILTER_MAX)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identifier")
+    if (filter < 0 || filter > H5Z_FILTER_MAX)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identifier")
     if (flags & ~((unsigned)H5Z_FLAG_DEFMASK))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid flags")
-    if (cd_nelmts>0 && !cd_values)
+    if (cd_nelmts > 0 && !cd_values)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no client data values supplied")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-
     /* Modify the filter parameters of the I/O pipeline */
-    if(H5P_modify_filter(plist, filter, flags, cd_nelmts, cd_values) < 0)
+    if (H5P_modify_filter(plist, filter, flags, cd_nelmts, cd_values) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't modify filter")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pmodify_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_filter
  *
@@ -648,36 +633,35 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags,
-        size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/])
+H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+              const unsigned int cd_values[/*cd_nelmts*/])
 {
-    H5P_genplist_t  *plist;             /* Property list */
-    herr_t          ret_value=SUCCEED;  /* return value */
+    H5P_genplist_t *plist;               /* Property list */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values);
 
     /* Check args */
-    if (filter<0 || filter>H5Z_FILTER_MAX)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identifier")
+    if (filter < 0 || filter > H5Z_FILTER_MAX)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identifier")
     if (flags & ~((unsigned)H5Z_FLAG_DEFMASK))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid flags")
-    if (cd_nelmts>0 && !cd_values)
+    if (cd_nelmts > 0 && !cd_values)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no client data values supplied")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Call the private function */
-    if(H5P__set_filter(plist, filter, flags, cd_nelmts, cd_values) < 0)
+    if (H5P__set_filter(plist, filter, flags, cd_nelmts, cd_values) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "failed to call private function")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__set_filter
  *
@@ -714,36 +698,35 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned int flags,
-        size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/])
+H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+                const unsigned int cd_values[/*cd_nelmts*/])
 {
-    H5O_pline_t     pline;                  /* Filter pipeline */
-    htri_t          filter_avail;           /* Filter availability */
-    herr_t          ret_value = SUCCEED;    /* Return value */
+    H5O_pline_t pline;               /* Filter pipeline */
+    htri_t      filter_avail;        /* Filter availability */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Check if filter is already available */
-    if((filter_avail = H5Z_filter_avail(filter)) < 0)
+    if ((filter_avail = H5Z_filter_avail(filter)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't check filter availability")
 
     /* Get the pipeline property to append to */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Add the filter to the I/O pipeline */
-    if(H5Z_append(&pline, filter, flags, cd_nelmts, cd_values) < 0)
+    if (H5Z_append(&pline, filter, flags, cd_nelmts, cd_values) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add filter to pipeline")
 
     /* Put the I/O pipeline information back into the property list */
-    if(H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__set_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_nfilters
  *
@@ -767,29 +750,28 @@ done:
 int
 H5Pget_nfilters(hid_t plist_id)
 {
-    H5P_genplist_t  *plist;         /* Property list */
-    H5O_pline_t     pline;          /* Filter pipeline */
-    int             ret_value;      /* return value */
+    H5P_genplist_t *plist;     /* Property list */
+    H5O_pline_t     pline;     /* Filter pipeline */
+    int             ret_value; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("Is", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to query */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Set return value */
-    ret_value=(int)(pline.nused);
+    ret_value = (int)(pline.nused);
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_nfilters */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_filter2
  *
@@ -815,58 +797,57 @@ done:
  *-------------------------------------------------------------------------
  */
 H5Z_filter_t
-H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags/*out*/,
-        size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-        size_t namelen, char name[]/*out*/,
+H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/, size_t *cd_nelmts /*in_out*/,
+               unsigned cd_values[] /*out*/, size_t namelen, char name[] /*out*/,
                unsigned *filter_config /*out*/)
 {
-    H5P_genplist_t  *plist;             /* Property list */
-    H5O_pline_t     pline;              /* Filter pipeline */
+    H5P_genplist_t *         plist;     /* Property list */
+    H5O_pline_t              pline;     /* Filter pipeline */
     const H5Z_filter_info_t *filter;    /* Pointer to filter information */
-    H5Z_filter_t    ret_value;          /* return value */
+    H5Z_filter_t             ret_value; /* return value */
 
     FUNC_ENTER_API(H5Z_FILTER_ERROR)
-    H5TRACE8("Zf", "iIux*zxzxx", plist_id, idx, flags, cd_nelmts, cd_values,
-             namelen, name, filter_config);
+    H5TRACE8("Zf", "iIux*zxzxx", plist_id, idx, flags, cd_nelmts, cd_values, namelen, name, filter_config);
 
     /* Check args */
-    if(cd_nelmts || cd_values) {
+    if (cd_nelmts || cd_values) {
         /*
          * It's likely that users forget to initialize this on input, so
          * we'll check that it has a reasonable value.  The actual number
          * is unimportant because the H5O layer will detect when a message
          * is too large.
          */
-        if(cd_nelmts && *cd_nelmts > 256)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "probable uninitialized *cd_nelmts argument")
-        if(cd_nelmts && *cd_nelmts > 0 && !cd_values)
+        if (cd_nelmts && *cd_nelmts > 256)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR,
+                        "probable uninitialized *cd_nelmts argument")
+        if (cd_nelmts && *cd_nelmts > 0 && !cd_values)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "client data values not supplied")
 
         /*
          * If cd_nelmts is null but cd_values is non-null then just ignore
          * cd_values
          */
-        if(!cd_nelmts)
+        if (!cd_nelmts)
             cd_values = NULL;
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5Z_FILTER_ERROR, "can't find object for ID")
 
     /* Get the pipeline property to query */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5Z_FILTER_ERROR, "can't get pipeline")
 
     /* Check index */
-    if(idx >= pline.nused)
+    if (idx >= pline.nused)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "filter number is invalid")
 
     /* Set pointer to particular filter to query */
     filter = &pline.filter[idx];
 
     /* Get filter information */
-    if(H5P__get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
+    if (H5P__get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5Z_FILTER_ERROR, "can't get filter info")
 
     /* Set return value */
@@ -876,7 +857,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_filter2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_get_filter_by_id
  *
@@ -900,33 +880,32 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5P_get_filter_by_id(H5P_genplist_t *plist, H5Z_filter_t id, unsigned int *flags/*out*/,
-    size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-    size_t namelen, char name[]/*out*/, unsigned *filter_config)
+H5P_get_filter_by_id(H5P_genplist_t *plist, H5Z_filter_t id, unsigned int *flags /*out*/,
+                     size_t *cd_nelmts /*in_out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                     char name[] /*out*/, unsigned *filter_config)
 {
-    H5O_pline_t         pline;  /* Filter pipeline */
-    H5Z_filter_info_t *filter;  /* Pointer to filter information */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5O_pline_t        pline;               /* Filter pipeline */
+    H5Z_filter_info_t *filter;              /* Pointer to filter information */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get pipeline info */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Get pointer to filter in pipeline */
-    if(NULL == (filter = H5Z_filter_info(&pline, id)))
+    if (NULL == (filter = H5Z_filter_info(&pline, id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "filter ID is invalid")
 
     /* Get filter information */
-    if(H5P__get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
+    if (H5P__get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get filter info")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_get_filter_by_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_filter_by_id2
  *
@@ -950,52 +929,49 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags/*out*/,
-    size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-    size_t namelen, char name[]/*out*/, unsigned *filter_config)
+H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out*/,
+                     size_t *cd_nelmts /*in_out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                     char name[] /*out*/, unsigned *filter_config)
 {
-    H5P_genplist_t  *plist;                 /* Property list */
-    herr_t          ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("e", "iZfx*zxzx*Iu", plist_id, id, flags, cd_nelmts, cd_values,
-             namelen, name, filter_config);
+    H5TRACE8("e", "iZfx*zxzx*Iu", plist_id, id, flags, cd_nelmts, cd_values, namelen, name, filter_config);
 
     /* Check args */
-    if(cd_nelmts || cd_values) {
+    if (cd_nelmts || cd_values) {
         /*
          * It's likely that users forget to initialize this on input, so
          * we'll check that it has a reasonable value.  The actual number
          * is unimportant because the H5O layer will detect when a message
          * is too large.
          */
-        if(cd_nelmts && *cd_nelmts > 256)
+        if (cd_nelmts && *cd_nelmts > 256)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "probable uninitialized *cd_nelmts argument")
-        if(cd_nelmts && *cd_nelmts > 0 && !cd_values)
+        if (cd_nelmts && *cd_nelmts > 0 && !cd_values)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "client data values not supplied")
 
         /*
          * If cd_nelmts is null but cd_values is non-null then just ignore
          * cd_values
          */
-        if(!cd_nelmts)
+        if (!cd_nelmts)
             cd_values = NULL;
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get filter information */
-    if(H5P_get_filter_by_id(plist, id, flags, cd_nelmts, cd_values, namelen,
-            name, filter_config) < 0)
+    if (H5P_get_filter_by_id(plist, id, flags, cd_nelmts, cd_values, namelen, name, filter_config) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get filter info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_filter_by_id2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pall_filters_avail
  *
@@ -1014,30 +990,29 @@ done:
 htri_t
 H5Pall_filters_avail(hid_t plist_id)
 {
-    H5P_genplist_t  *plist;         /* Property list */
-    H5O_pline_t     pline;          /* Filter pipeline */
-    htri_t          ret_value;      /* Return value */
+    H5P_genplist_t *plist;     /* Property list */
+    H5O_pline_t     pline;     /* Filter pipeline */
+    htri_t          ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("t", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to query */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Check if all filters are available */
-    if((ret_value = H5Z_all_filters_avail(&pline)) < 0)
+    if ((ret_value = H5Z_all_filters_avail(&pline)) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "can't check pipeline information")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pall_filters_avail() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P_filter_in_pline
  *
@@ -1056,24 +1031,23 @@ done:
 htri_t
 H5P_filter_in_pline(H5P_genplist_t *plist, H5Z_filter_t id)
 {
-    H5O_pline_t         pline;  /* Filter pipeline */
-    htri_t ret_value = SUCCEED;   /* Return value */
+    H5O_pline_t pline;               /* Filter pipeline */
+    htri_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get pipeline info */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Check if the file is in the pipeline */
-    if((ret_value = H5Z_filter_in_pline(&pline, id)) < 0)
+    if ((ret_value = H5Z_filter_in_pline(&pline, id)) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTCOMPARE, FAIL, "can't find filter")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_filter_in_pline() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5Premove_filter
  *
@@ -1090,29 +1064,29 @@ done:
 herr_t
 H5Premove_filter(hid_t plist_id, H5Z_filter_t filter)
 {
-    H5P_genplist_t  *plist;                 /* Property list */
-    H5O_pline_t     pline;                  /* Filter pipeline */
-    herr_t          ret_value = SUCCEED;    /* return value          */
+    H5P_genplist_t *plist;               /* Property list */
+    H5O_pline_t     pline;               /* Filter pipeline */
+    herr_t          ret_value = SUCCEED; /* return value          */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iZf", plist_id, filter);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to modify */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Check if there are any filters */
     if (pline.filter) {
         /* Delete filter */
-        if(H5Z_delete(&pline, filter) < 0)
+        if (H5Z_delete(&pline, filter) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't delete filter")
 
         /* Put the I/O pipeline information back into the property list */
-        if(H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+        if (H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
     } /* end if */
 
@@ -1120,7 +1094,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Premove_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_deflate
  *
@@ -1142,38 +1115,37 @@ done:
 herr_t
 H5Pset_deflate(hid_t plist_id, unsigned level)
 {
-    H5P_genplist_t  *plist;                 /* Property list */
-    H5O_pline_t     pline;                  /* Filter pipeline */
-    herr_t          ret_value = SUCCEED;    /* return value */
+    H5P_genplist_t *plist;               /* Property list */
+    H5O_pline_t     pline;               /* Filter pipeline */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", plist_id, level);
 
     /* Check arguments */
-    if(level > 9)
-        HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid deflate level")
+    if (level > 9)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid deflate level")
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to append to */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Add the filter */
-    if(H5Z_append(&pline, H5Z_FILTER_DEFLATE, H5Z_FLAG_OPTIONAL, (size_t)1, &level) < 0)
+    if (H5Z_append(&pline, H5Z_FILTER_DEFLATE, H5Z_FLAG_OPTIONAL, (size_t)1, &level) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add deflate filter to pipeline")
 
     /* Put the I/O pipeline information back into the property list */
-    if(H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_deflate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fletcher32
  *
@@ -1190,34 +1162,33 @@ done:
 herr_t
 H5Pset_fletcher32(hid_t plist_id)
 {
-    H5P_genplist_t  *plist;             /* Property list */
-    H5O_pline_t     pline;              /* Filter pipeline */
-    herr_t          ret_value=SUCCEED;  /* return value */
+    H5P_genplist_t *plist;               /* Property list */
+    H5O_pline_t     pline;               /* Filter pipeline */
+    herr_t          ret_value = SUCCEED; /* return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", plist_id);
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the pipeline property to append to */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
 
     /* Add the Fletcher32 checksum as a filter */
-    if(H5Z_append(&pline, H5Z_FILTER_FLETCHER32, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0)
+    if (H5Z_append(&pline, H5Z_FILTER_FLETCHER32, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add fletcher32 filter to pipeline")
 
     /* Put the I/O pipeline information back into the property list */
-    if(H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_poke(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_fletcher32() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__get_filter
  *
@@ -1231,10 +1202,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5P__get_filter(const H5Z_filter_info_t *filter, unsigned int *flags/*out*/,
-    size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-    size_t namelen, char name[]/*out*/,
-    unsigned *filter_config /*out*/)
+H5P__get_filter(const H5Z_filter_info_t *filter, unsigned int *flags /*out*/, size_t *cd_nelmts /*in_out*/,
+                unsigned cd_values[] /*out*/, size_t namelen, char name[] /*out*/,
+                unsigned *filter_config /*out*/)
 {
     FUNC_ENTER_PACKAGE_NOERR
 
@@ -1242,58 +1212,57 @@ H5P__get_filter(const H5Z_filter_info_t *filter, unsigned int *flags/*out*/,
     HDassert(filter);
 
     /* Filter flags */
-    if(flags)
+    if (flags)
         *flags = filter->flags;
 
     /* Filter parameters */
-    if(cd_values) {
-        size_t    i;                      /* Local index variable */
+    if (cd_values) {
+        size_t i; /* Local index variable */
 
-        for(i = 0; i < filter->cd_nelmts && i < *cd_nelmts; i++)
+        for (i = 0; i < filter->cd_nelmts && i < *cd_nelmts; i++)
             cd_values[i] = filter->cd_values[i];
     } /* end if */
 
     /* Number of filter parameters */
-    if(cd_nelmts)
+    if (cd_nelmts)
         *cd_nelmts = filter->cd_nelmts;
 
     /* Filter name */
-    if(namelen > 0 && name) {
+    if (namelen > 0 && name) {
         const char *s = filter->name;
 
         /* If there's no name on the filter, use the class's filter name */
-        if(!s) {
+        if (!s) {
             H5Z_class2_t *cls = H5Z_find(filter->id);
 
-            if(cls)
+            if (cls)
                 s = cls->name;
         } /* end if */
 
         /* Check for actual name */
-        if(s) {
+        if (s) {
             HDstrncpy(name, s, namelen);
             name[namelen - 1] = '\0';
         } /* end if */
         else {
             /* Check for unknown library filter */
             /* (probably from a future version of the library) */
-            if(filter->id < 256) {
+            if (filter->id < 256) {
                 HDstrncpy(name, "Unknown library filter", namelen);
                 name[namelen - 1] = '\0';
             } /* end if */
             else
                 name[0] = '\0';
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Filter configuration (assume filter ID has already been checked) */
-    if(filter_config)
+    if (filter_config)
         H5Z_get_filter_info(filter->id, filter_config);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P__get_filter() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__ocrt_pipeline_set
  *
@@ -1309,11 +1278,11 @@ H5P__get_filter(const H5Z_filter_info_t *filter, unsigned int *flags/*out*/,
  */
 static herr_t
 H5P__ocrt_pipeline_set(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
-    size_t H5_ATTR_UNUSED size, void *value)
+                       size_t H5_ATTR_UNUSED size, void *value)
 {
-    H5O_pline_t     *pline = (H5O_pline_t *)value; /* Create local aliases for values */
-    H5O_pline_t     new_pline;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_pline_t *pline = (H5O_pline_t *)value; /* Create local aliases for values */
+    H5O_pline_t  new_pline;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1321,7 +1290,7 @@ H5P__ocrt_pipeline_set(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *
     HDassert(value);
 
     /* Make copy of I/O pipeline */
-    if(NULL == H5O_msg_copy(H5O_PLINE_ID, pline, &new_pline))
+    if (NULL == H5O_msg_copy(H5O_PLINE_ID, pline, &new_pline))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy I/O pipeline")
 
     /* Copy new I/O pipeline message over old one */
@@ -1331,7 +1300,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_pipeline_set() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__ocrt_pipeline_get
  *
@@ -1347,11 +1315,11 @@ done:
  */
 static herr_t
 H5P__ocrt_pipeline_get(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
-    size_t H5_ATTR_UNUSED size, void *value)
+                       size_t H5_ATTR_UNUSED size, void *value)
 {
-    H5O_pline_t     *pline = (H5O_pline_t *)value; /* Create local aliases for values */
-    H5O_pline_t     new_pline;
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_pline_t *pline = (H5O_pline_t *)value; /* Create local aliases for values */
+    H5O_pline_t  new_pline;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1359,7 +1327,7 @@ H5P__ocrt_pipeline_get(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *
     HDassert(value);
 
     /* Make copy of I/O pipeline */
-    if(NULL == H5O_msg_copy(H5O_PLINE_ID, pline, &new_pline))
+    if (NULL == H5O_msg_copy(H5O_PLINE_ID, pline, &new_pline))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy I/O pipeline")
 
     /* Copy new I/O pipeline message over old one */
@@ -1369,7 +1337,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_pipeline_get() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__ocrt_pipeline_enc
  *
@@ -1389,8 +1356,8 @@ static herr_t
 H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
 {
     const H5O_pline_t *pline = (const H5O_pline_t *)value;
-    uint8_t **pp = (uint8_t **)_pp;
-    size_t u;           /* Local index variable */
+    uint8_t **         pp    = (uint8_t **)_pp;
+    size_t             u; /* Local index variable */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1398,7 +1365,7 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
     HDassert(size);
     HDcompile_assert(sizeof(size_t) <= sizeof(uint64_t));
 
-    if(NULL != *pp) {
+    if (NULL != *pp) {
         unsigned enc_size;
         uint64_t enc_value;
 
@@ -1407,14 +1374,14 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
 
         /* encode nused value */
         enc_value = (uint64_t)pline->nused;
-        enc_size = H5VM_limit_enc_size(enc_value);
+        enc_size  = H5VM_limit_enc_size(enc_value);
         HDassert(enc_size < 256);
         *(*pp)++ = (uint8_t)enc_size;
         UINT64ENCODE_VAR(*pp, enc_value, enc_size);
 
         /* encode each pipeline */
-        for(u = 0; u < pline->nused; u++) {
-            unsigned v;         /* Local index variable */
+        for (u = 0; u < pline->nused; u++) {
+            unsigned v; /* Local index variable */
 
             /* encode filter ID */
             INT32ENCODE(*pp, pline->filter[u].id)
@@ -1423,7 +1390,7 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
             H5_ENCODE_UNSIGNED(*pp, pline->filter[u].flags)
 
             /* encode filter name if it exists */
-            if(NULL != pline->filter[u].name) {
+            if (NULL != pline->filter[u].name) {
                 /* encode TRUE indicating that it exits */
                 *(*pp)++ = (uint8_t)TRUE;
 
@@ -1437,23 +1404,23 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
 
             /* encode cd_nelmts */
             enc_value = (uint64_t)pline->filter[u].cd_nelmts;
-            enc_size = H5VM_limit_enc_size(enc_value);
+            enc_size  = H5VM_limit_enc_size(enc_value);
             HDassert(enc_size < 256);
             *(*pp)++ = (uint8_t)enc_size;
             UINT64ENCODE_VAR(*pp, enc_value, enc_size);
 
             /* encode all values */
-            for(v = 0; v < pline->filter[u].cd_nelmts; v++)
+            for (v = 0; v < pline->filter[u].cd_nelmts; v++)
                 H5_ENCODE_UNSIGNED(*pp, pline->filter[u].cd_values[v])
         } /* end for */
-    } /* end if */
+    }     /* end if */
 
     /* calculate size required for encoding */
     *size += 1;
     *size += (1 + H5VM_limit_enc_size((uint64_t)pline->nused));
-    for(u = 0; u < pline->nused; u++) {
+    for (u = 0; u < pline->nused; u++) {
         *size += (sizeof(int32_t) + sizeof(unsigned) + 1);
-        if(NULL != pline->filter[u].name)
+        if (NULL != pline->filter[u].name)
             *size += H5Z_COMMON_NAME_LEN;
         *size += (1 + H5VM_limit_enc_size((uint64_t)pline->filter[u].cd_nelmts));
         *size += pline->filter[u].cd_nelmts * sizeof(unsigned);
@@ -1462,7 +1429,6 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5P__ocrt_pipeline_enc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__ocrt_pipeline_dec
  *
@@ -1481,13 +1447,13 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size)
 static herr_t
 H5P__ocrt_pipeline_dec(const void **_pp, void *_value)
 {
-    H5O_pline_t *pline = (H5O_pline_t *)_value;   /* Property to set */
-    const uint8_t **pp = (const uint8_t **)_pp;
-    size_t nused;                       /* Number of filters used for pipeline */
-    unsigned enc_size;                  /* Size of encoded value (in bytes) */
-    uint64_t enc_value;                 /* Value to encode */
-    size_t u;                           /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_pline_t *   pline = (H5O_pline_t *)_value; /* Property to set */
+    const uint8_t **pp    = (const uint8_t **)_pp;
+    size_t          nused;               /* Number of filters used for pipeline */
+    unsigned        enc_size;            /* Size of encoded value (in bytes) */
+    uint64_t        enc_value;           /* Value to encode */
+    size_t          u;                   /* Local index variable */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1495,7 +1461,7 @@ H5P__ocrt_pipeline_dec(const void **_pp, void *_value)
 
     /* Decode the size of size_t */
     enc_size = *(*pp)++;
-    if(enc_size != sizeof(unsigned))
+    if (enc_size != sizeof(unsigned))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "unsigned value can't be decoded")
 
     /* decode nused */
@@ -1508,10 +1474,10 @@ H5P__ocrt_pipeline_dec(const void **_pp, void *_value)
     HDmemset(pline, 0, sizeof(H5O_pline_t));
     *pline = H5O_def_pline_g;
 
-    for(u = 0; u < nused; u++) {
-        H5Z_filter_info_t filter;       /* Filter info, for pipeline */
-        uint8_t has_name;               /* Flag to indicate whether filter has a name */
-        unsigned v;                     /* Local index variable */
+    for (u = 0; u < nused; u++) {
+        H5Z_filter_info_t filter;   /* Filter info, for pipeline */
+        uint8_t           has_name; /* Flag to indicate whether filter has a name */
+        unsigned          v;        /* Local index variable */
 
         /* decode filter id */
         INT32DECODE(*pp, filter.id)
@@ -1521,7 +1487,7 @@ H5P__ocrt_pipeline_dec(const void **_pp, void *_value)
 
         /* decode value indicating if the name is encoded */
         has_name = *(*pp)++;
-        if(has_name) {
+        if (has_name) {
             /* decode name */
             filter.name = H5MM_xstrdup((const char *)(*pp));
             *pp += H5Z_COMMON_NAME_LEN;
@@ -1535,19 +1501,19 @@ H5P__ocrt_pipeline_dec(const void **_pp, void *_value)
         UINT64DECODE_VAR(*pp, enc_value, enc_size);
         filter.cd_nelmts = (size_t)enc_value;
 
-        if(filter.cd_nelmts) {
-            if(NULL == (filter.cd_values = (unsigned *)H5MM_malloc(sizeof(unsigned) * filter.cd_nelmts)))
+        if (filter.cd_nelmts) {
+            if (NULL == (filter.cd_values = (unsigned *)H5MM_malloc(sizeof(unsigned) * filter.cd_nelmts)))
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "memory allocation failed for cd_values")
         } /* end if */
         else
             filter.cd_values = NULL;
 
         /* decode values */
-        for(v = 0; v < filter.cd_nelmts; v++)
+        for (v = 0; v < filter.cd_nelmts; v++)
             H5_DECODE_UNSIGNED(*pp, filter.cd_values[v])
 
         /* Add the filter to the I/O pipeline */
-        if(H5Z_append(pline, filter.id, filter.flags, filter.cd_nelmts, filter.cd_values) < 0)
+        if (H5Z_append(pline, filter.id, filter.flags, filter.cd_nelmts, filter.cd_values) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add filter to pipeline")
 
         /* Free cd_values, if it was allocated */
@@ -1558,7 +1524,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5P__ocrt_pipeline_dec() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__ocrt_pipeline_del
  *
@@ -1574,9 +1539,9 @@ done:
  */
 static herr_t
 H5P__ocrt_pipeline_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *name,
-    size_t H5_ATTR_UNUSED size, void *value)
+                       size_t H5_ATTR_UNUSED size, void *value)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1584,14 +1549,13 @@ H5P__ocrt_pipeline_del(hid_t H5_ATTR_UNUSED prop_id, const char H5_ATTR_UNUSED *
     HDassert(value);
 
     /* Reset the old I/O pipeline */
-    if(H5O_msg_reset(H5O_PLINE_ID, value) < 0)
+    if (H5O_msg_reset(H5O_PLINE_ID, value) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTRESET, FAIL, "can't release I/O pipeline message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_pipeline_del() */
 
-
 /*--------------------------------------------------------------------------
  * Function:    H5P__ocrt_pipeline_copy
  *
@@ -1606,12 +1570,11 @@ done:
  *--------------------------------------------------------------------------
  */
 static herr_t
-H5P__ocrt_pipeline_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size,
-    void *value)
+H5P__ocrt_pipeline_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
 {
-    H5O_pline_t     *pline = (H5O_pline_t *)value; /* Create local aliases for values */
-    H5O_pline_t     new_pline;
-    herr_t          ret_value = SUCCEED;
+    H5O_pline_t *pline = (H5O_pline_t *)value; /* Create local aliases for values */
+    H5O_pline_t  new_pline;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
@@ -1619,7 +1582,7 @@ H5P__ocrt_pipeline_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED s
     HDassert(pline);
 
     /* Make copy of I/O pipeline */
-    if(NULL == H5O_msg_copy(H5O_PLINE_ID, pline, &new_pline))
+    if (NULL == H5O_msg_copy(H5O_PLINE_ID, pline, &new_pline))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy I/O pipeline")
 
     /* Copy new I/O pipeline message over old one */
@@ -1629,7 +1592,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_pipeline_copy() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5P__ocrt_pipeline_cmp
  *
@@ -1648,9 +1610,9 @@ done:
 static int
 H5P__ocrt_pipeline_cmp(const void *_pline1, const void *_pline2, size_t H5_ATTR_UNUSED size)
 {
-    const H5O_pline_t *pline1 = (const H5O_pline_t *)_pline1,     /* Create local aliases for values */
-        *pline2 = (const H5O_pline_t *)_pline2;
-    int cmp_value;              /* Value from comparison */
+    const H5O_pline_t *pline1 = (const H5O_pline_t *)_pline1, /* Create local aliases for values */
+        *pline2               = (const H5O_pline_t *)_pline2;
+    int    cmp_value;     /* Value from comparison */
     herr_t ret_value = 0; /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
@@ -1661,57 +1623,72 @@ H5P__ocrt_pipeline_cmp(const void *_pline1, const void *_pline2, size_t H5_ATTR_
     HDassert(size == sizeof(H5O_pline_t));
 
     /* Check the number of used pipeline entries */
-    if(pline1->nused < pline2->nused) HGOTO_DONE(-1);
-    if(pline1->nused > pline2->nused) HGOTO_DONE(1);
+    if (pline1->nused < pline2->nused)
+        HGOTO_DONE(-1);
+    if (pline1->nused > pline2->nused)
+        HGOTO_DONE(1);
 
     /* Check the filter entry information */
-    if(pline1->filter == NULL && pline2->filter != NULL) HGOTO_DONE(-1);
-    if(pline1->filter != NULL && pline2->filter == NULL) HGOTO_DONE(1);
-    if(pline1->filter != NULL && pline1->nused > 0) {
-        size_t u;       /* Local index variable */
+    if (pline1->filter == NULL && pline2->filter != NULL)
+        HGOTO_DONE(-1);
+    if (pline1->filter != NULL && pline2->filter == NULL)
+        HGOTO_DONE(1);
+    if (pline1->filter != NULL && pline1->nused > 0) {
+        size_t u; /* Local index variable */
 
         /* Loop through all filters, comparing them */
-        for(u = 0; u < pline1->nused; u++) {
+        for (u = 0; u < pline1->nused; u++) {
             /* Check the ID of the filter */
-            if(pline1->filter[u].id < pline2->filter[u].id) HGOTO_DONE(-1);
-            if(pline1->filter[u].id > pline2->filter[u].id) HGOTO_DONE(1);
+            if (pline1->filter[u].id < pline2->filter[u].id)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].id > pline2->filter[u].id)
+                HGOTO_DONE(1);
 
             /* Check the flags for the filter */
-            if(pline1->filter[u].flags < pline2->filter[u].flags) HGOTO_DONE(-1);
-            if(pline1->filter[u].flags > pline2->filter[u].flags) HGOTO_DONE(1);
+            if (pline1->filter[u].flags < pline2->filter[u].flags)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].flags > pline2->filter[u].flags)
+                HGOTO_DONE(1);
 
             /* Check the name of the filter */
-            if(pline1->filter[u].name == NULL && pline2->filter[u].name != NULL) HGOTO_DONE(-1);
-            if(pline1->filter[u].name != NULL && pline2->filter[u].name == NULL) HGOTO_DONE(1);
-            if(pline1->filter[u].name != NULL)
-                if((cmp_value = HDstrcmp(pline1->filter[u].name, pline2->filter[u].name)) != 0)
+            if (pline1->filter[u].name == NULL && pline2->filter[u].name != NULL)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].name != NULL && pline2->filter[u].name == NULL)
+                HGOTO_DONE(1);
+            if (pline1->filter[u].name != NULL)
+                if ((cmp_value = HDstrcmp(pline1->filter[u].name, pline2->filter[u].name)) != 0)
                     HGOTO_DONE(cmp_value);
 
             /* Check the number of parameters for the filter */
-            if(pline1->filter[u].cd_nelmts < pline2->filter[u].cd_nelmts) HGOTO_DONE(-1);
-            if(pline1->filter[u].cd_nelmts > pline2->filter[u].cd_nelmts) HGOTO_DONE(1);
+            if (pline1->filter[u].cd_nelmts < pline2->filter[u].cd_nelmts)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].cd_nelmts > pline2->filter[u].cd_nelmts)
+                HGOTO_DONE(1);
 
             /* Check the filter parameter information */
-            if(pline1->filter[u].cd_values == NULL && pline2->filter[u].cd_values != NULL) HGOTO_DONE(-1);
-            if(pline1->filter[u].cd_values != NULL && pline2->filter[u].cd_values == NULL) HGOTO_DONE(1);
-            if(pline1->filter[u].cd_values != NULL && pline1->filter[u].cd_nelmts > 0) {
-                size_t v;       /* Local index variable */
+            if (pline1->filter[u].cd_values == NULL && pline2->filter[u].cd_values != NULL)
+                HGOTO_DONE(-1);
+            if (pline1->filter[u].cd_values != NULL && pline2->filter[u].cd_values == NULL)
+                HGOTO_DONE(1);
+            if (pline1->filter[u].cd_values != NULL && pline1->filter[u].cd_nelmts > 0) {
+                size_t v; /* Local index variable */
 
                 /* Loop through all parameters, comparing them */
-                for(v = 0; v < pline1->filter[u].cd_nelmts; v++) {
+                for (v = 0; v < pline1->filter[u].cd_nelmts; v++) {
                     /* Check each parameter for the filter */
-                    if(pline1->filter[u].cd_values[v] < pline2->filter[u].cd_values[v]) HGOTO_DONE(-1);
-                    if(pline1->filter[u].cd_values[v] > pline2->filter[u].cd_values[v]) HGOTO_DONE(1);
+                    if (pline1->filter[u].cd_values[v] < pline2->filter[u].cd_values[v])
+                        HGOTO_DONE(-1);
+                    if (pline1->filter[u].cd_values[v] > pline2->filter[u].cd_values[v])
+                        HGOTO_DONE(1);
                 } /* end for */
-            } /* end if */
-        } /* end for */
-    } /* end if */
+            }     /* end if */
+        }         /* end for */
+    }             /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__ocrt_pipeline_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5P__ocrt_pipeline_close
  *
@@ -1726,10 +1703,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5P__ocrt_pipeline_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size,
-    void *value)
+H5P__ocrt_pipeline_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1737,7 +1713,7 @@ H5P__ocrt_pipeline_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED
     HDassert(value);
 
     /* Reset the old I/O pipeline */
-    if(H5O_msg_reset(H5O_PLINE_ID, value) < 0)
+    if (H5O_msg_reset(H5O_PLINE_ID, value) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTRESET, FAIL, "can't release I/O pipeline message")
 
 done:
@@ -1745,7 +1721,7 @@ done:
 } /* end H5P__ocrt_pipeline_close() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_filter1
  *
@@ -1770,57 +1746,56 @@ done:
  *-------------------------------------------------------------------------
  */
 H5Z_filter_t
-H5Pget_filter1(hid_t plist_id, unsigned idx, unsigned int *flags/*out*/,
-        size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-        size_t namelen, char name[]/*out*/)
+H5Pget_filter1(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/, size_t *cd_nelmts /*in_out*/,
+               unsigned cd_values[] /*out*/, size_t namelen, char name[] /*out*/)
 {
-    H5O_pline_t         pline;  /* Filter pipeline */
-    const H5Z_filter_info_t *filter;  /* Pointer to filter information */
-    H5P_genplist_t *plist;      /* Property list pointer */
-    H5Z_filter_t ret_value;     /* return value */
+    H5O_pline_t              pline;     /* Filter pipeline */
+    const H5Z_filter_info_t *filter;    /* Pointer to filter information */
+    H5P_genplist_t *         plist;     /* Property list pointer */
+    H5Z_filter_t             ret_value; /* return value */
 
     FUNC_ENTER_API(H5Z_FILTER_ERROR)
-    H5TRACE7("Zf", "iIux*zxzx", plist_id, idx, flags, cd_nelmts, cd_values, namelen,
-             name);
+    H5TRACE7("Zf", "iIux*zxzx", plist_id, idx, flags, cd_nelmts, cd_values, namelen, name);
 
     /* Check args */
-    if(cd_nelmts || cd_values) {
+    if (cd_nelmts || cd_values) {
         /*
          * It's likely that users forget to initialize this on input, so
          * we'll check that it has a reasonable value.  The actual number
          * is unimportant because the H5O layer will detect when a message
          * is too large.
          */
-        if(cd_nelmts && *cd_nelmts > 256)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "probable uninitialized *cd_nelmts argument")
-        if(cd_nelmts && *cd_nelmts > 0 && !cd_values)
+        if (cd_nelmts && *cd_nelmts > 256)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR,
+                        "probable uninitialized *cd_nelmts argument")
+        if (cd_nelmts && *cd_nelmts > 0 && !cd_values)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "client data values not supplied")
 
         /*
          * If cd_nelmts is null but cd_values is non-null then just ignore
          * cd_values
          */
-        if(!cd_nelmts)
+        if (!cd_nelmts)
             cd_values = NULL;
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5Z_FILTER_ERROR, "can't find object for ID")
 
     /* Get pipeline info */
-    if(H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
+    if (H5P_peek(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5Z_FILTER_ERROR, "can't get pipeline")
 
     /* Check more args */
-    if(idx >= pline.nused)
+    if (idx >= pline.nused)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_FILTER_ERROR, "filter number is invalid")
 
     /* Set pointer to particular filter to query */
     filter = &pline.filter[idx];
 
     /* Get filter information */
-    if(H5P__get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, NULL) < 0)
+    if (H5P__get_filter(filter, flags, cd_nelmts, cd_values, namelen, name, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5Z_FILTER_ERROR, "can't get filter info")
 
     /* Set return value */
@@ -1830,7 +1805,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_filter1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_filter_by_id1
  *
@@ -1853,48 +1827,46 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id, unsigned int *flags/*out*/,
-    size_t *cd_nelmts/*in_out*/, unsigned cd_values[]/*out*/,
-    size_t namelen, char name[]/*out*/)
+H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out*/,
+                     size_t *cd_nelmts /*in_out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                     char name[] /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "iZfx*zxzx", plist_id, id, flags, cd_nelmts, cd_values, namelen,
-             name);
+    H5TRACE7("e", "iZfx*zxzx", plist_id, id, flags, cd_nelmts, cd_values, namelen, name);
 
     /* Check args */
-    if(cd_nelmts || cd_values) {
+    if (cd_nelmts || cd_values) {
         /*
          * It's likely that users forget to initialize this on input, so
          * we'll check that it has a reasonable value.  The actual number
          * is unimportant because the H5O layer will detect when a message
          * is too large.
          */
-        if(cd_nelmts && *cd_nelmts > 256)
+        if (cd_nelmts && *cd_nelmts > 256)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "probable uninitialized *cd_nelmts argument")
-        if(cd_nelmts && *cd_nelmts > 0 && !cd_values)
+        if (cd_nelmts && *cd_nelmts > 0 && !cd_values)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "client data values not supplied")
 
         /*
          * If cd_nelmts is null but cd_values is non-null then just ignore
          * cd_values
          */
-        if(!cd_nelmts)
+        if (!cd_nelmts)
             cd_values = NULL;
     } /* end if */
 
     /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
+    if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get filter info */
-    if(H5P_get_filter_by_id(plist, id, flags, cd_nelmts, cd_values, namelen, name, NULL) < 0)
+    if (H5P_get_filter_by_id(plist, id, flags, cd_nelmts, cd_values, namelen, name, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get filter info")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_filter_by_id1() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-