Clang-format of source files

1 files changed, 137 insertions, 128 deletions

diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index b1a46f2..76b2753 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -30,62 +30,60 @@
 #include "H5Sprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5Oprivate.h"		/* Object headers		  	*/
+#include "H5Oprivate.h" /* Object headers		  	*/
 
 /* Flags to indicate special dataspace features are active */
-#define H5S_VALID_MAX	0x01
-#define H5S_VALID_PERM	0x02
+#define H5S_VALID_MAX  0x01
+#define H5S_VALID_PERM 0x02
 
 /* Flags for serialization of selections */
-#define H5S_HYPER_REGULAR       0x01
-#define H5S_SELECT_FLAG_BITS    (H5S_HYPER_REGULAR)
+#define H5S_HYPER_REGULAR    0x01
+#define H5S_SELECT_FLAG_BITS (H5S_HYPER_REGULAR)
 
 /* Versions for H5S_SEL_HYPER selection info */
-#define H5S_HYPER_VERSION_1         1
-#define H5S_HYPER_VERSION_2         2
-#define H5S_HYPER_VERSION_3         3
-#define H5S_HYPER_VERSION_LATEST    H5S_HYPER_VERSION_3
+#define H5S_HYPER_VERSION_1      1
+#define H5S_HYPER_VERSION_2      2
+#define H5S_HYPER_VERSION_3      3
+#define H5S_HYPER_VERSION_LATEST H5S_HYPER_VERSION_3
 
 /* Versions for H5S_SEL_POINTS selection info */
-#define H5S_POINT_VERSION_1         1
-#define H5S_POINT_VERSION_2         2
-#define H5S_POINT_VERSION_LATEST    H5S_POINT_VERSION_2
+#define H5S_POINT_VERSION_1      1
+#define H5S_POINT_VERSION_2      2
+#define H5S_POINT_VERSION_LATEST H5S_POINT_VERSION_2
 
 /* Versions for H5S_SEL_NONE selection info */
-#define H5S_NONE_VERSION_1          1
-#define H5S_NONE_VERSION_LATEST     H5S_NONE_VERSION_1
+#define H5S_NONE_VERSION_1      1
+#define H5S_NONE_VERSION_LATEST H5S_NONE_VERSION_1
 
 /* Versions for H5S_SEL_ALL selection info */
-#define H5S_ALL_VERSION_1           1
-#define H5S_ALL_VERSION_LATEST      H5S_ALL_VERSION_1
+#define H5S_ALL_VERSION_1      1
+#define H5S_ALL_VERSION_LATEST H5S_ALL_VERSION_1
 
 /* Encoded size of selection info for H5S_SEL_POINTS/H5S_SEL_HYPER */
-#define H5S_SELECT_INFO_ENC_SIZE_2 0x02        /* 2 bytes: 16 bits */
-#define H5S_SELECT_INFO_ENC_SIZE_4 0x04        /* 4 bytes: 32 bits */
-#define H5S_SELECT_INFO_ENC_SIZE_8 0x08        /* 8 bytes: 64 bits */
-#define H5S_SELECT_INFO_ENC_SIZE_BITS   ( H5S_SELECT_INFO_ENC_SIZE_2 |    \
-                                          H5S_SELECT_INFO_ENC_SIZE_4 |    \
-                                          H5S_SELECT_INFO_ENC_SIZE_8 )
+#define H5S_SELECT_INFO_ENC_SIZE_2 0x02 /* 2 bytes: 16 bits */
+#define H5S_SELECT_INFO_ENC_SIZE_4 0x04 /* 4 bytes: 32 bits */
+#define H5S_SELECT_INFO_ENC_SIZE_8 0x08 /* 8 bytes: 64 bits */
+#define H5S_SELECT_INFO_ENC_SIZE_BITS                                                                        \
+    (H5S_SELECT_INFO_ENC_SIZE_2 | H5S_SELECT_INFO_ENC_SIZE_4 | H5S_SELECT_INFO_ENC_SIZE_8)
 
-#define H5S_UINT16_MAX      0x0000FFFF  /* 2^16 - 1 = 65,535                            */
-#define H5S_UINT32_MAX      0xFFFFFFFF  /* 2^32 - 1 = 4,294,967,295                     */
-#define H5S_UINT64_MAX      ((hsize_t)(-1L))   /* 2^64 - 1 = 18,446,744,073,709,551,615 */
+#define H5S_UINT16_MAX 0x0000FFFF       /* 2^16 - 1 = 65,535                            */
+#define H5S_UINT32_MAX 0xFFFFFFFF       /* 2^32 - 1 = 4,294,967,295                     */
+#define H5S_UINT64_MAX ((hsize_t)(-1L)) /* 2^64 - 1 = 18,446,744,073,709,551,615 */
 
 /* Length of stack-allocated sequences for "project intersect" routines */
 #define H5S_PROJECT_INTERSECT_NSEQS 256
 
 /* Internal flags for initializing selection iterators */
-#define H5S_SEL_ITER_API_CALL   0x1000 /* Selection iterator created from API call */
-
+#define H5S_SEL_ITER_API_CALL 0x1000 /* Selection iterator created from API call */
 
 /* Initial version of the dataspace information */
-#define H5O_SDSPACE_VERSION_1	1
+#define H5O_SDSPACE_VERSION_1 1
 
 /* This version adds support for "null" dataspaces, encodes the type of the
  *      dataspace in the message and eliminated the rest of the "reserved"
  *      bytes.
  */
-#define H5O_SDSPACE_VERSION_2	2
+#define H5O_SDSPACE_VERSION_2 2
 
 /* The latest version of the format.  Look through the 'encode'
  *      and 'size' callbacks for places to change when updating this. */
@@ -93,7 +91,7 @@
 
 /* Maximum dimension size (highest value that is not a special value e.g.
  * H5S_UNLIMITED) */
-#define H5S_MAX_SIZE            ((hsize_t)(hssize_t)(-2))
+#define H5S_MAX_SIZE ((hsize_t)(hssize_t)(-2))
 
 /* Macro for checking if two ranges overlap one another */
 /*
@@ -102,23 +100,22 @@
  * high bound of the other.
  */
 /* (Assumes that low & high bounds are _inclusive_) */
-#define H5S_RANGE_OVERLAP(L1, H1, L2, H2)       (!((L1) > (H2) || (L2) > (H1)))
-
+#define H5S_RANGE_OVERLAP(L1, H1, L2, H2) (!((L1) > (H2) || (L2) > (H1)))
 
 /*
  * Dataspace extent information
  */
 /* Extent container */
 struct H5S_extent_t {
-    H5O_shared_t sh_loc;        /* Shared message info (must be first) */
+    H5O_shared_t sh_loc; /* Shared message info (must be first) */
 
-    H5S_class_t	type;           /* Type of extent */
-    unsigned version;           /* Version of object header message to encode this object with */
-    hsize_t nelem;              /* Number of elements in extent */
+    H5S_class_t type;    /* Type of extent */
+    unsigned    version; /* Version of object header message to encode this object with */
+    hsize_t     nelem;   /* Number of elements in extent */
 
-    unsigned rank;              /* Number of dimensions */
-    hsize_t *size;              /* Current size of the dimensions */
-    hsize_t *max;               /* Maximum size of the dimensions */
+    unsigned rank; /* Number of dimensions */
+    hsize_t *size; /* Current size of the dimensions */
+    hsize_t *max;  /* Maximum size of the dimensions */
 };
 
 /*
@@ -127,48 +124,48 @@ struct H5S_extent_t {
 
 /* Node in point selection list (typedef'd in H5Sprivate.h) */
 struct H5S_pnt_node_t {
-    struct H5S_pnt_node_t *next; /* Pointer to next point in list */
-    hsize_t pnt[];              /* Selected point */
-                                /* (NOTE: This uses the C99 "flexible array member" feature) */
+    struct H5S_pnt_node_t *next;  /* Pointer to next point in list */
+    hsize_t                pnt[]; /* Selected point */
+                                  /* (NOTE: This uses the C99 "flexible array member" feature) */
 };
 
 /* Information about point selection list (typedef'd in H5Sprivate.h) */
 struct H5S_pnt_list_t {
     /* The following two fields defines the bounding box of the whole set of points, relative to the offset */
-    hsize_t low_bounds[H5S_MAX_RANK];   /* The smallest element selected in each dimension */
-    hsize_t high_bounds[H5S_MAX_RANK];  /* The largest element selected in each dimension */
+    hsize_t low_bounds[H5S_MAX_RANK];  /* The smallest element selected in each dimension */
+    hsize_t high_bounds[H5S_MAX_RANK]; /* The largest element selected in each dimension */
 
-    H5S_pnt_node_t *head;   /* Pointer to head of point list */
-    H5S_pnt_node_t *tail;   /* Pointer to tail of point list */
+    H5S_pnt_node_t *head; /* Pointer to head of point list */
+    H5S_pnt_node_t *tail; /* Pointer to tail of point list */
 };
 
 /* Information about hyperslab spans */
 
 /* Information a particular hyperslab span (typedef'd in H5Sprivate.h) */
 struct H5S_hyper_span_t {
-    hsize_t low, high;  /* Low & high bounds of elements selected for span, inclusive */
-    struct H5S_hyper_span_info_t *down; /* Pointer to list of spans in next dimension down */
-    struct H5S_hyper_span_t *next;      /* Pointer to next span in list */
+    hsize_t                       low, high; /* Low & high bounds of elements selected for span, inclusive */
+    struct H5S_hyper_span_info_t *down;      /* Pointer to list of spans in next dimension down */
+    struct H5S_hyper_span_t *     next;      /* Pointer to next span in list */
 };
 
 /* "Operation info" struct.  Used to hold temporary information during  copies,
  * 'adjust', 'nelem', and 'rebuild' operations, and higher level algorithms that
  * generate this information. */
 typedef struct H5S_hyper_op_info_t {
-    uint64_t op_gen;            /* Generation of the scratch info */
+    uint64_t op_gen; /* Generation of the scratch info */
     union {
         struct H5S_hyper_span_info_t *copied;  /* Pointer to already copied span tree */
-        hsize_t nelmts;         /* # of elements */
-        hsize_t nblocks;        /* # of blocks */
+        hsize_t                       nelmts;  /* # of elements */
+        hsize_t                       nblocks; /* # of blocks */
 #ifdef H5_HAVE_PARALLEL
         MPI_Datatype down_type; /* MPI datatype for span tree */
-#endif  /* H5_HAVE_PARALLEL */
-    }u;
+#endif                          /* H5_HAVE_PARALLEL */
+    } u;
 } H5S_hyper_op_info_t;
 
 /* Information about a list of hyperslab spans in one dimension (typedef'd in H5Sprivate.h) */
 struct H5S_hyper_span_info_t {
-    unsigned count;     /* Ref. count of number of spans which share this span */
+    unsigned count; /* Ref. count of number of spans which share this span */
 
     /* The following two fields define the bounding box of this set of spans
      *  and all lower dimensions, relative to the offset.
@@ -181,25 +178,26 @@ struct H5S_hyper_span_info_t {
      *          arrays correspond to the bounds in "this" dimension, even if
      *          it's not the highest level in the span tree.
      */
-    hsize_t *low_bounds;        /* The smallest element selected in each dimension */
-    hsize_t *high_bounds;       /* The largest element selected in each dimension */
+    hsize_t *low_bounds;  /* The smallest element selected in each dimension */
+    hsize_t *high_bounds; /* The largest element selected in each dimension */
 
     /* "Operation info" fields */
     /* (Used during copies, 'adjust', 'nelem', and 'rebuild' operations) */
     /* Currently the maximum number of simultaneous operations is 2 */
     H5S_hyper_op_info_t op_info[2];
 
-    struct H5S_hyper_span_t *head;  /* Pointer to the first span of list of spans in the current dimension */
-    struct H5S_hyper_span_t *tail;  /* Pointer to the last span of list of spans in the current dimension */
-    hsize_t bounds[];           /* Array for storing low & high bounds */
-                                /* (NOTE: This uses the C99 "flexible array member" feature) */
+    struct H5S_hyper_span_t *head; /* Pointer to the first span of list of spans in the current dimension */
+    struct H5S_hyper_span_t *tail; /* Pointer to the last span of list of spans in the current dimension */
+    hsize_t                  bounds[]; /* Array for storing low & high bounds */
+                                       /* (NOTE: This uses the C99 "flexible array member" feature) */
 };
 
 /* Enum for diminfo_valid field in H5S_hyper_sel_t */
 typedef enum {
-    H5S_DIMINFO_VALID_IMPOSSIBLE, /* 0: diminfo is not valid and can never be valid with the current selection */
-    H5S_DIMINFO_VALID_NO,       /* 1: diminfo is not valid but may or may not be possible to constuct */
-    H5S_DIMINFO_VALID_YES       /* 2: diminfo is valid */
+    H5S_DIMINFO_VALID_IMPOSSIBLE, /* 0: diminfo is not valid and can never be valid with the current selection
+                                   */
+    H5S_DIMINFO_VALID_NO,         /* 1: diminfo is not valid but may or may not be possible to constuct */
+    H5S_DIMINFO_VALID_YES         /* 2: diminfo is valid */
 } H5S_diminfo_valid_t;
 
 /* Information about 'diminfo' form of hyperslab selection */
@@ -212,23 +210,23 @@ typedef struct {
      * used to set the hyperslab to the application when it queries the
      * hyperslab selection information.
      */
-    H5S_hyper_dim_t app[H5S_MAX_RANK];  /* Application-set per-dim selection info */
-    H5S_hyper_dim_t opt[H5S_MAX_RANK];  /* Optimized per-dim selection info */
+    H5S_hyper_dim_t app[H5S_MAX_RANK]; /* Application-set per-dim selection info */
+    H5S_hyper_dim_t opt[H5S_MAX_RANK]; /* Optimized per-dim selection info */
 
     /* The following two fields defines the bounding box of the diminfo selection */
     /* (relative to the offset) */
-    hsize_t low_bounds[H5S_MAX_RANK];   /* The smallest element selected in each dimension */
-    hsize_t high_bounds[H5S_MAX_RANK];  /* The largest element selected in each dimension */
+    hsize_t low_bounds[H5S_MAX_RANK];  /* The smallest element selected in each dimension */
+    hsize_t high_bounds[H5S_MAX_RANK]; /* The largest element selected in each dimension */
 } H5S_hyper_diminfo_t;
 
 /* Information about hyperslab selection */
 typedef struct {
-    H5S_diminfo_valid_t diminfo_valid;  /* Whether the dataset has valid diminfo */
+    H5S_diminfo_valid_t diminfo_valid; /* Whether the dataset has valid diminfo */
 
-    H5S_hyper_diminfo_t diminfo;        /* Dimension info form of hyperslab selection */
-    int unlim_dim;                      /* Dimension where selection is unlimited, or -1 if none */
-    hsize_t num_elem_non_unlim;         /* # of elements in a "slice" excluding the unlimited dimension */
-    H5S_hyper_span_info_t *span_lst;    /* List of hyperslab span information of all dimensions */
+    H5S_hyper_diminfo_t diminfo;            /* Dimension info form of hyperslab selection */
+    int                 unlim_dim;          /* Dimension where selection is unlimited, or -1 if none */
+    hsize_t             num_elem_non_unlim; /* # of elements in a "slice" excluding the unlimited dimension */
+    H5S_hyper_span_info_t *span_lst;        /* List of hyperslab span information of all dimensions */
 } H5S_hyper_sel_t;
 
 /* Selection information methods */
@@ -251,8 +249,7 @@ typedef herr_t (*H5S_sel_offset_func_t)(const H5S_t *space, hsize_t *offset);
 /* Method to get unlimited dimension of selection (or -1 for none) */
 typedef int (*H5S_sel_unlim_dim_func_t)(const H5S_t *space);
 /* Method to get the number of elements in a slice through the unlimited dimension */
-typedef herr_t (*H5S_sel_num_elem_non_unlim_func_t)(const H5S_t *space,
-    hsize_t *num_elem_non_unlim);
+typedef herr_t (*H5S_sel_num_elem_non_unlim_func_t)(const H5S_t *space, hsize_t *num_elem_non_unlim);
 /* Method to determine if current selection is contiguous */
 typedef htri_t (*H5S_sel_is_contiguous_func_t)(const H5S_t *space);
 /* Method to determine if current selection is a single block */
@@ -262,7 +259,8 @@ typedef htri_t (*H5S_sel_is_regular_func_t)(const H5S_t *space);
 /* Method to determine if two dataspaces' selections are the same shape */
 typedef htri_t (*H5S_sel_shape_same_func_t)(const H5S_t *space1, const H5S_t *space2);
 /* Method to determine if selection intersects a block */
-typedef htri_t (*H5S_sel_intersect_block_func_t)(const H5S_t *space, const hsize_t *start, const hsize_t *end);
+typedef htri_t (*H5S_sel_intersect_block_func_t)(const H5S_t *space, const hsize_t *start,
+                                                 const hsize_t *end);
 /* Method to adjust a selection by an offset */
 typedef herr_t (*H5S_sel_adjust_u_func_t)(H5S_t *space, const hsize_t *offset);
 /* Method to adjust a selection by an offset (signed) */
@@ -276,50 +274,58 @@ typedef herr_t (*H5S_sel_iter_init_func_t)(const H5S_t *space, H5S_sel_iter_t *s
 
 /* Selection class information */
 typedef struct {
-    H5S_sel_type type;                          /* Type of selection (all, none, points or hyperslab) */
+    H5S_sel_type type; /* Type of selection (all, none, points or hyperslab) */
 
     /* Methods */
-    H5S_sel_copy_func_t copy;                   /* Method to make a copy of a selection */
-    H5S_sel_release_func_t release;             /* Method to release current selection */
-    H5S_sel_is_valid_func_t is_valid;           /* Method to determine if current selection is valid for dataspace */
-    H5S_sel_serial_size_func_t serial_size;     /* Method to determine number of bytes required to store current selection */
-    H5S_sel_serialize_func_t serialize;         /* Method to store current selection in "serialized" form (a byte sequence suitable for storing on disk) */
-    H5S_sel_deserialize_func_t deserialize;     /* Method to store create selection from "serialized" form (a byte sequence suitable for storing on disk) */
-    H5S_sel_bounds_func_t bounds;               /* Method to determine to smallest n-D bounding box containing the current selection */
-    H5S_sel_offset_func_t offset;               /* Method to determine linear offset of initial element in selection within dataspace */
-    H5S_sel_unlim_dim_func_t unlim_dim;         /* Method to get unlimited dimension of selection (or -1 for none) */
-    H5S_sel_num_elem_non_unlim_func_t num_elem_non_unlim; /* Method to get the number of elements in a slice through the unlimited dimension */
+    H5S_sel_copy_func_t     copy;     /* Method to make a copy of a selection */
+    H5S_sel_release_func_t  release;  /* Method to release current selection */
+    H5S_sel_is_valid_func_t is_valid; /* Method to determine if current selection is valid for dataspace */
+    H5S_sel_serial_size_func_t
+                             serial_size; /* Method to determine number of bytes required to store current selection */
+    H5S_sel_serialize_func_t serialize;     /* Method to store current selection in "serialized" form (a byte
+                                               sequence suitable for storing on disk) */
+    H5S_sel_deserialize_func_t deserialize; /* Method to store create selection from "serialized" form (a byte
+                                               sequence suitable for storing on disk) */
+    H5S_sel_bounds_func_t
+        bounds; /* Method to determine to smallest n-D bounding box containing the current selection */
+    H5S_sel_offset_func_t
+                             offset; /* Method to determine linear offset of initial element in selection within dataspace */
+    H5S_sel_unlim_dim_func_t unlim_dim; /* Method to get unlimited dimension of selection (or -1 for none) */
+    H5S_sel_num_elem_non_unlim_func_t num_elem_non_unlim; /* Method to get the number of elements in a slice
+                                                             through the unlimited dimension */
     H5S_sel_is_contiguous_func_t is_contiguous; /* Method to determine if current selection is contiguous */
-    H5S_sel_is_single_func_t is_single;         /* Method to determine if current selection is a single block */
-    H5S_sel_is_regular_func_t is_regular;       /* Method to determine if current selection is "regular" */
-    H5S_sel_shape_same_func_t shape_same;       /* Method to determine if two dataspaces' selections are the same shape */
-    H5S_sel_intersect_block_func_t intersect_block; /* Method to determine if a dataspaces' selection intersects a block */
-    H5S_sel_adjust_u_func_t adjust_u;           /* Method to adjust a selection by an offset */
-    H5S_sel_adjust_s_func_t adjust_s;           /* Method to adjust a selection by an offset (signed) */
-    H5S_sel_project_scalar project_scalar;      /* Method to construct scalar dataspace projection */
-    H5S_sel_project_simple project_simple;      /* Method to construct simple dataspace projection */
-    H5S_sel_iter_init_func_t iter_init;         /* Method to initialize iterator for current selection */
+    H5S_sel_is_single_func_t     is_single;  /* Method to determine if current selection is a single block */
+    H5S_sel_is_regular_func_t    is_regular; /* Method to determine if current selection is "regular" */
+    H5S_sel_shape_same_func_t
+        shape_same; /* Method to determine if two dataspaces' selections are the same shape */
+    H5S_sel_intersect_block_func_t
+                             intersect_block; /* Method to determine if a dataspaces' selection intersects a block */
+    H5S_sel_adjust_u_func_t  adjust_u;        /* Method to adjust a selection by an offset */
+    H5S_sel_adjust_s_func_t  adjust_s;        /* Method to adjust a selection by an offset (signed) */
+    H5S_sel_project_scalar   project_scalar; /* Method to construct scalar dataspace projection */
+    H5S_sel_project_simple   project_simple; /* Method to construct simple dataspace projection */
+    H5S_sel_iter_init_func_t iter_init;      /* Method to initialize iterator for current selection */
 } H5S_select_class_t;
 
 /* Selection information object */
 typedef struct {
-    const H5S_select_class_t *type;     /* Pointer to selection's class info */
+    const H5S_select_class_t *type; /* Pointer to selection's class info */
 
-    hbool_t offset_changed;             /* Indicate that the offset for the selection has been changed */
-    hssize_t offset[H5S_MAX_RANK];      /* Offset within the extent */
+    hbool_t  offset_changed;       /* Indicate that the offset for the selection has been changed */
+    hssize_t offset[H5S_MAX_RANK]; /* Offset within the extent */
 
-    hsize_t num_elem;                   /* Number of elements in selection */
+    hsize_t num_elem; /* Number of elements in selection */
 
     union {
-        H5S_pnt_list_t *pnt_lst;        /* Info about list of selected points (order is important) */
-        H5S_hyper_sel_t *hslab;         /* Info about hyperslab selection */
+        H5S_pnt_list_t * pnt_lst; /* Info about list of selected points (order is important) */
+        H5S_hyper_sel_t *hslab;   /* Info about hyperslab selection */
     } sel_info;
 } H5S_select_t;
 
 /* Main dataspace structure (typedef'd in H5Sprivate.h) */
 struct H5S_t {
-    H5S_extent_t extent;                /* Dataspace extent (must stay first) */
-    H5S_select_t select;		/* Dataspace selection */
+    H5S_extent_t extent; /* Dataspace extent (must stay first) */
+    H5S_select_t select; /* Dataspace selection */
 };
 
 /* Selection iteration methods */
@@ -336,25 +342,31 @@ typedef herr_t (*H5S_sel_iter_next_func_t)(H5S_sel_iter_t *iter, size_t nelem);
 /* Method to move selection iterator to the next block in the selection */
 typedef herr_t (*H5S_sel_iter_next_block_func_t)(H5S_sel_iter_t *iter);
 /* Method to retrieve a list of offset/length sequences for selection iterator */
-typedef herr_t (*H5S_sel_iter_get_seq_list_func_t)(H5S_sel_iter_t *iter,
-    size_t maxseq, size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off,
-    size_t *len);
+typedef herr_t (*H5S_sel_iter_get_seq_list_func_t)(H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes,
+                                                   size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
 /* Method to release iterator for current selection */
 typedef herr_t (*H5S_sel_iter_release_func_t)(H5S_sel_iter_t *iter);
 
 /* Selection iteration class */
 typedef struct H5S_sel_iter_class_t {
-    H5S_sel_type type;                          /* Type of selection (all, none, points or hyperslab) */
+    H5S_sel_type type; /* Type of selection (all, none, points or hyperslab) */
 
     /* Methods on selections */
-    H5S_sel_iter_coords_func_t iter_coords;     /* Method to retrieve the current coordinates of iterator for current selection */
-    H5S_sel_iter_block_func_t iter_block;       /* Method to retrieve the current block of iterator for current selection */
-    H5S_sel_iter_nelmts_func_t iter_nelmts;     /* Method to determine number of elements left in iterator for current selection */
-    H5S_sel_iter_has_next_block_func_t iter_has_next_block;         /* Method to query if there is another block left in the selection */
-    H5S_sel_iter_next_func_t iter_next;         /* Method to move selection iterator to the next element in the selection */
-    H5S_sel_iter_next_block_func_t iter_next_block;     /* Method to move selection iterator to the next block in the selection */
-    H5S_sel_iter_get_seq_list_func_t iter_get_seq_list; /* Method to retrieve a list of offset/length sequences for selection iterator */
-    H5S_sel_iter_release_func_t iter_release;   /* Method to release iterator for current selection */
+    H5S_sel_iter_coords_func_t
+        iter_coords; /* Method to retrieve the current coordinates of iterator for current selection */
+    H5S_sel_iter_block_func_t
+        iter_block; /* Method to retrieve the current block of iterator for current selection */
+    H5S_sel_iter_nelmts_func_t
+        iter_nelmts; /* Method to determine number of elements left in iterator for current selection */
+    H5S_sel_iter_has_next_block_func_t
+        iter_has_next_block; /* Method to query if there is another block left in the selection */
+    H5S_sel_iter_next_func_t
+        iter_next; /* Method to move selection iterator to the next element in the selection */
+    H5S_sel_iter_next_block_func_t
+        iter_next_block; /* Method to move selection iterator to the next block in the selection */
+    H5S_sel_iter_get_seq_list_func_t
+                                iter_get_seq_list; /* Method to retrieve a list of offset/length sequences for selection iterator */
+    H5S_sel_iter_release_func_t iter_release; /* Method to release iterator for current selection */
 } H5S_sel_iter_class_t;
 
 /*
@@ -382,25 +394,22 @@ H5_DLLVAR const unsigned H5O_sdspace_ver_bounds[H5F_LIBVER_NBOUNDS];
 
 /* Extent functions */
 H5_DLL herr_t H5S__extent_release(H5S_extent_t *extent);
-H5_DLL herr_t H5S__extent_copy_real(H5S_extent_t *dst, const H5S_extent_t *src,
-    hbool_t copy_max);
+H5_DLL herr_t H5S__extent_copy_real(H5S_extent_t *dst, const H5S_extent_t *src, hbool_t copy_max);
 
 /* Operations on hyperslab selections */
 H5_DLL uint64_t H5S__hyper_get_op_gen(void);
-H5_DLL void H5S__hyper_rebuild(H5S_t *space);
-H5_DLL herr_t H5S__modify_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2);
-H5_DLL herr_t H5S__hyper_project_intersection(const H5S_t *src_space,
-    const H5S_t *dst_space, const H5S_t *src_intersect_space, H5S_t *proj_space,
-    hbool_t share_space);
+H5_DLL void     H5S__hyper_rebuild(H5S_t *space);
+H5_DLL herr_t   H5S__modify_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2);
+H5_DLL herr_t   H5S__hyper_project_intersection(const H5S_t *src_space, const H5S_t *dst_space,
+                                                const H5S_t *src_intersect_space, H5S_t *proj_space,
+                                                hbool_t share_space);
 
 /* Testing functions */
 #ifdef H5S_TESTING
-H5_DLL herr_t H5S__get_rebuild_status_test(hid_t space_id,
-    H5S_diminfo_valid_t *status1, H5S_diminfo_valid_t *status2);
-H5_DLL herr_t H5S__get_diminfo_status_test(hid_t space_id,
-    H5S_diminfo_valid_t *status);
+H5_DLL herr_t H5S__get_rebuild_status_test(hid_t space_id, H5S_diminfo_valid_t *status1,
+                                           H5S_diminfo_valid_t *status2);
+H5_DLL herr_t H5S__get_diminfo_status_test(hid_t space_id, H5S_diminfo_valid_t *status);
 H5_DLL htri_t H5S__internal_consistency_test(hid_t space_id);
 #endif /* H5S_TESTING */
 
 #endif /*_H5Spkg_H*/
-