Source formatted

1 files changed, 161 insertions, 174 deletions

diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index e90123f..1a6a502 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -30,94 +30,89 @@
 #include "H5Fprivate.h"
 
 /* Other public headers needed by this file */
-#include "H5Bpublic.h"          /* B-tree header, for H5B_NUM_BTREE_ID */
+#include "H5Bpublic.h" /* B-tree header, for H5B_NUM_BTREE_ID */
 
 /* Other private headers needed by this file */
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5FOprivate.h"        /* File objects                         */
-#include "H5FSprivate.h"	/* File free space                      */
-#include "H5Gprivate.h"		/* Groups 			  	*/
-#include "H5Oprivate.h"         /* Object header messages               */
-#include "H5RCprivate.h"	/* Reference counted object functions	*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
+#include "H5FLprivate.h" /* Free Lists                           */
+#include "H5FOprivate.h" /* File objects                         */
+#include "H5FSprivate.h" /* File free space                      */
+#include "H5Gprivate.h"  /* Groups 			  	*/
+#include "H5Oprivate.h"  /* Object header messages               */
+#include "H5RCprivate.h" /* Reference counted object functions	*/
 
 /*
  * Feature: Define this constant on the compiler command-line if you want to
  *	    see some debugging messages on the debug stream.
  */
 #ifdef NDEBUG
-#  undef H5F_DEBUG
+#undef H5F_DEBUG
 #endif
 
 /* Superblock status flags */
-#define H5F_SUPER_WRITE_ACCESS          0x01
-#define H5F_SUPER_FILE_OK               0x02
-#define H5F_SUPER_ALL_FLAGS             (H5F_SUPER_WRITE_ACCESS | H5F_SUPER_FILE_OK)
+#define H5F_SUPER_WRITE_ACCESS 0x01
+#define H5F_SUPER_FILE_OK      0x02
+#define H5F_SUPER_ALL_FLAGS    (H5F_SUPER_WRITE_ACCESS | H5F_SUPER_FILE_OK)
 
 /* Mask for removing private file access flags */
-#define H5F_ACC_PUBLIC_FLAGS 	        0x001fu
+#define H5F_ACC_PUBLIC_FLAGS 0x001fu
 
 /* Free space section+aggregator merge flags */
-#define H5F_FS_MERGE_METADATA           0x01    /* Section can merge with metadata aggregator */
-#define H5F_FS_MERGE_RAWDATA            0x02    /* Section can merge with small 'raw' data aggregator */
+#define H5F_FS_MERGE_METADATA 0x01 /* Section can merge with metadata aggregator */
+#define H5F_FS_MERGE_RAWDATA  0x02 /* Section can merge with small 'raw' data aggregator */
 
 /* Macro to abstract checking whether file is using a free space manager */
-#define H5F_HAVE_FREE_SPACE_MANAGER(F)  TRUE    /* Currently always have a free space manager */
+#define H5F_HAVE_FREE_SPACE_MANAGER(F) TRUE /* Currently always have a free space manager */
 
 /* Macros for encoding/decoding superblock */
-#define H5F_MAX_DRVINFOBLOCK_SIZE  1024         /* Maximum size of superblock driver info buffer */
-#define H5F_DRVINFOBLOCK_HDR_SIZE 16            /* Size of superblock driver info header */
+#define H5F_MAX_DRVINFOBLOCK_SIZE 1024 /* Maximum size of superblock driver info buffer */
+#define H5F_DRVINFOBLOCK_HDR_SIZE 16   /* Size of superblock driver info header */
 
 /* Superblock sizes for various versions */
-#define H5F_SIZEOF_CHKSUM 4     /* Checksum size in the file */
+#define H5F_SIZEOF_CHKSUM 4 /* Checksum size in the file */
 
 /* Fixed-size portion at the beginning of all superblocks */
-#define H5F_SUPERBLOCK_FIXED_SIZE ( H5F_SIGNATURE_LEN                   \
-        + 1) /* superblock version */
+#define H5F_SUPERBLOCK_FIXED_SIZE (H5F_SIGNATURE_LEN + 1) /* superblock version */
 
 /* Macros for computing variable-size superblock size */
-#define H5F_SUPERBLOCK_VARLEN_SIZE_COMMON                               \
-        (2  /* freespace, and root group versions */			\
-        + 1 /* reserved */                                              \
-        + 3 /* shared header vers, size of address, size of lengths */  \
-        + 1 /* reserved */                                              \
-        + 4 /* group leaf k, group internal k */                        \
-        + 4) /* consistency flags */
-#define H5F_SUPERBLOCK_VARLEN_SIZE_V0(f)                                \
-        ( H5F_SUPERBLOCK_VARLEN_SIZE_COMMON /* Common variable-length info */ \
-        + H5F_SIZEOF_ADDR(f) /* base address */                         \
-        + H5F_SIZEOF_ADDR(f) /* <unused> */				\
-        + H5F_SIZEOF_ADDR(f) /* EOF address */                          \
-        + H5F_SIZEOF_ADDR(f) /* driver block address */                 \
-        + H5G_SIZEOF_ENTRY(f)) /* root group ptr */
-#define H5F_SUPERBLOCK_VARLEN_SIZE_V1(f)                                \
-        ( H5F_SUPERBLOCK_VARLEN_SIZE_COMMON /* Common variable-length info */ \
-        + 2 /* indexed B-tree internal k */                             \
-        + 2 /* reserved */                                              \
-        + H5F_SIZEOF_ADDR(f) /* base address */                         \
-        + H5F_SIZEOF_ADDR(f) /* <unused> */				\
-        + H5F_SIZEOF_ADDR(f) /* EOF address */                          \
-        + H5F_SIZEOF_ADDR(f) /* driver block address */                 \
-        + H5G_SIZEOF_ENTRY(f)) /* root group ptr */
-#define H5F_SUPERBLOCK_VARLEN_SIZE_V2(f)                                \
-        ( 2 /* size of address, size of lengths */                      \
-        + 1 /* consistency flags */                                     \
-        + H5F_SIZEOF_ADDR(f) /* base address */                         \
-        + H5F_SIZEOF_ADDR(f) /* superblock extension address */         \
-        + H5F_SIZEOF_ADDR(f) /* EOF address */                          \
-        + H5F_SIZEOF_ADDR(f) /* root group object header address */     \
-        + H5F_SIZEOF_CHKSUM) /* superblock checksum (keep this last) */
-#define H5F_SUPERBLOCK_VARLEN_SIZE(v, f) (				\
-        (v == 0 ? H5F_SUPERBLOCK_VARLEN_SIZE_V0(f) : 0)			\
-        + (v == 1 ? H5F_SUPERBLOCK_VARLEN_SIZE_V1(f) : 0)               \
-        + (v == 2 ? H5F_SUPERBLOCK_VARLEN_SIZE_V2(f) : 0))
+#define H5F_SUPERBLOCK_VARLEN_SIZE_COMMON                                                                    \
+    (2    /* freespace, and root group versions */                                                           \
+     + 1  /* reserved */                                                                                     \
+     + 3  /* shared header vers, size of address, size of lengths */                                         \
+     + 1  /* reserved */                                                                                     \
+     + 4  /* group leaf k, group internal k */                                                               \
+     + 4) /* consistency flags */
+#define H5F_SUPERBLOCK_VARLEN_SIZE_V0(f)                                                                     \
+    (H5F_SUPERBLOCK_VARLEN_SIZE_COMMON /* Common variable-length info */                                     \
+     + H5F_SIZEOF_ADDR(f)              /* base address */                                                    \
+     + H5F_SIZEOF_ADDR(f)              /* <unused> */                                                        \
+     + H5F_SIZEOF_ADDR(f)              /* EOF address */                                                     \
+     + H5F_SIZEOF_ADDR(f)              /* driver block address */                                            \
+     + H5G_SIZEOF_ENTRY(f))            /* root group ptr */
+#define H5F_SUPERBLOCK_VARLEN_SIZE_V1(f)                                                                     \
+    (H5F_SUPERBLOCK_VARLEN_SIZE_COMMON /* Common variable-length info */                                     \
+     + 2                               /* indexed B-tree internal k */                                       \
+     + 2                               /* reserved */                                                        \
+     + H5F_SIZEOF_ADDR(f)              /* base address */                                                    \
+     + H5F_SIZEOF_ADDR(f)              /* <unused> */                                                        \
+     + H5F_SIZEOF_ADDR(f)              /* EOF address */                                                     \
+     + H5F_SIZEOF_ADDR(f)              /* driver block address */                                            \
+     + H5G_SIZEOF_ENTRY(f))            /* root group ptr */
+#define H5F_SUPERBLOCK_VARLEN_SIZE_V2(f)                                                                     \
+    (2                    /* size of address, size of lengths */                                             \
+     + 1                  /* consistency flags */                                                            \
+     + H5F_SIZEOF_ADDR(f) /* base address */                                                                 \
+     + H5F_SIZEOF_ADDR(f) /* superblock extension address */                                                 \
+     + H5F_SIZEOF_ADDR(f) /* EOF address */                                                                  \
+     + H5F_SIZEOF_ADDR(f) /* root group object header address */                                             \
+     + H5F_SIZEOF_CHKSUM) /* superblock checksum (keep this last) */
+#define H5F_SUPERBLOCK_VARLEN_SIZE(v, f)                                                                     \
+    ((v == 0 ? H5F_SUPERBLOCK_VARLEN_SIZE_V0(f) : 0) + (v == 1 ? H5F_SUPERBLOCK_VARLEN_SIZE_V1(f) : 0) +     \
+     (v == 2 ? H5F_SUPERBLOCK_VARLEN_SIZE_V2(f) : 0))
 
 /* Total size of superblock, depends on superblock version */
-#define H5F_SUPERBLOCK_SIZE(v, f) ( H5F_SUPERBLOCK_FIXED_SIZE           \
-        + H5F_SUPERBLOCK_VARLEN_SIZE(v, f))
-
+#define H5F_SUPERBLOCK_SIZE(v, f) (H5F_SUPERBLOCK_FIXED_SIZE + H5F_SUPERBLOCK_VARLEN_SIZE(v, f))
 
 /* Forward declaration external file cache struct used below (defined in
  * H5Fefc.c) */
@@ -125,35 +120,35 @@ typedef struct H5F_efc_t H5F_efc_t;
 
 /* Structure for metadata & "small [raw] data" block aggregation fields */
 struct H5F_blk_aggr_t {
-    unsigned long       feature_flag;   /* Feature flag type */
-    hsize_t             alloc_size;     /* Size for allocating new blocks */
-    hsize_t             tot_size;       /* Total amount of bytes aggregated into block */
-    hsize_t             size;           /* Current size of block left */
-    haddr_t             addr;           /* Location of block left */
+    unsigned long feature_flag; /* Feature flag type */
+    hsize_t       alloc_size;   /* Size for allocating new blocks */
+    hsize_t       tot_size;     /* Total amount of bytes aggregated into block */
+    hsize_t       size;         /* Current size of block left */
+    haddr_t       addr;         /* Location of block left */
 };
 
 /* Structure for metadata accumulator fields */
 typedef struct H5F_meta_accum_t {
-    unsigned char      *buf;            /* Buffer to hold the accumulated metadata */
-    haddr_t             loc;            /* File location (offset) of the accumulated metadata */
-    size_t              size;           /* Size of the accumulated metadata buffer used (in bytes) */
-    size_t              alloc_size;     /* Size of the accumulated metadata buffer allocated (in bytes) */
-    size_t              dirty_off;      /* Offset of the dirty region in the accumulator buffer */
-    size_t              dirty_len;      /* Length of the dirty region in the accumulator buffer */
-    hbool_t             dirty;          /* Flag to indicate that the accumulated metadata is dirty */
+    unsigned char *buf;        /* Buffer to hold the accumulated metadata */
+    haddr_t        loc;        /* File location (offset) of the accumulated metadata */
+    size_t         size;       /* Size of the accumulated metadata buffer used (in bytes) */
+    size_t         alloc_size; /* Size of the accumulated metadata buffer allocated (in bytes) */
+    size_t         dirty_off;  /* Offset of the dirty region in the accumulator buffer */
+    size_t         dirty_len;  /* Length of the dirty region in the accumulator buffer */
+    hbool_t        dirty;      /* Flag to indicate that the accumulated metadata is dirty */
 } H5F_meta_accum_t;
 
 /* Enum for free space manager state */
 typedef enum H5F_fs_state_t {
-    H5F_FS_STATE_CLOSED,                /* Free space manager is closed */
-    H5F_FS_STATE_OPEN,                  /* Free space manager has been opened */
-    H5F_FS_STATE_DELETING               /* Free space manager is being deleted */
+    H5F_FS_STATE_CLOSED,  /* Free space manager is closed */
+    H5F_FS_STATE_OPEN,    /* Free space manager has been opened */
+    H5F_FS_STATE_DELETING /* Free space manager is being deleted */
 } H5F_fs_state_t;
 
 /* A record of the mount table */
 typedef struct H5F_mount_t {
-    struct H5G_t	*group;	/* Mount point group held open		*/
-    struct H5F_t	*file;	/* File mounted at that point		*/
+    struct H5G_t *group; /* Mount point group held open		*/
+    struct H5F_t *file;  /* File mounted at that point		*/
 } H5F_mount_t;
 
 /*
@@ -161,26 +156,26 @@ typedef struct H5F_mount_t {
  * to which this table belongs.
  */
 typedef struct H5F_mtab_t {
-    unsigned		nmounts;/* Number of children which are mounted	*/
-    unsigned		nalloc;	/* Number of mount slots allocated	*/
-    H5F_mount_t		*child;	/* An array of mount records		*/
+    unsigned     nmounts; /* Number of children which are mounted	*/
+    unsigned     nalloc;  /* Number of mount slots allocated	*/
+    H5F_mount_t *child;   /* An array of mount records		*/
 } H5F_mtab_t;
 
 /* Structure specifically to store superblock. This was originally
  * maintained entirely within H5F_file_t, but is now extracted
  * here because the superblock is now handled by the cache */
 typedef struct H5F_super_t {
-    H5AC_info_t cache_info;     /* Cache entry information structure          */
-    unsigned    super_vers;     /* Superblock version                         */
-    uint8_t     status_flags;   /* File status flags                          */
-    unsigned    sym_leaf_k;     /* Size of leaves in symbol tables            */
+    H5AC_info_t cache_info;                /* Cache entry information structure          */
+    unsigned    super_vers;                /* Superblock version                         */
+    uint8_t     status_flags;              /* File status flags                          */
+    unsigned    sym_leaf_k;                /* Size of leaves in symbol tables            */
     unsigned    btree_k[H5B_NUM_BTREE_ID]; /* B-tree key values for each type */
-    haddr_t     base_addr;      /* Absolute base address for rel.addrs.       */
-                                /* (superblock for file is at this offset)    */
-    haddr_t     ext_addr;       /* Relative address of superblock extension   */
-    haddr_t     driver_addr;    /* File driver information block address      */
-    haddr_t     root_addr;      /* Root group address                         */
-    H5G_entry_t *root_ent;      /* Root group symbol table entry              */
+    haddr_t     base_addr;                 /* Absolute base address for rel.addrs.       */
+                                           /* (superblock for file is at this offset)    */
+    haddr_t      ext_addr;                 /* Relative address of superblock extension   */
+    haddr_t      driver_addr;              /* File driver information block address      */
+    haddr_t      root_addr;                /* Root group address                         */
+    H5G_entry_t *root_ent;                 /* Root group symbol table entry              */
 } H5F_super_t;
 
 /*
@@ -191,60 +186,59 @@ typedef struct H5F_super_t {
  * pointing to this struct.
  */
 struct H5F_file_t {
-    H5FD_t	*lf; 		/* Lower level file handle for I/O	*/
-    H5F_super_t *sblock;        /* Pointer to (pinned) superblock for file */
-    unsigned	nrefs;		/* Ref count for times file is opened	*/
-    unsigned	flags;		/* Access Permissions for file          */
-    H5F_mtab_t	mtab;		/* File mount table                     */
-    H5F_efc_t   *efc;           /* External file cache                  */
+    H5FD_t *     lf;     /* Lower level file handle for I/O	*/
+    H5F_super_t *sblock; /* Pointer to (pinned) superblock for file */
+    unsigned     nrefs;  /* Ref count for times file is opened	*/
+    unsigned     flags;  /* Access Permissions for file          */
+    H5F_mtab_t   mtab;   /* File mount table                     */
+    H5F_efc_t *  efc;    /* External file cache                  */
 
     /* Cached values from FCPL/superblock */
-    uint8_t	sizeof_addr;	/* Size of addresses in file            */
-    uint8_t	sizeof_size;	/* Size of offsets in file              */
-    haddr_t	sohm_addr;	/* Relative address of shared object header message table */
-    unsigned	sohm_vers;	/* Version of shared message table on disk */
-    unsigned	sohm_nindexes;	/* Number of shared messages indexes in the table */
+    uint8_t       sizeof_addr;   /* Size of addresses in file            */
+    uint8_t       sizeof_size;   /* Size of offsets in file              */
+    haddr_t       sohm_addr;     /* Relative address of shared object header message table */
+    unsigned      sohm_vers;     /* Version of shared message table on disk */
+    unsigned      sohm_nindexes; /* Number of shared messages indexes in the table */
     unsigned long feature_flags; /* VFL Driver feature Flags            */
-    haddr_t	maxaddr;	/* Maximum address for file             */
-
-    H5AC_t      *cache;		/* The object cache	 		*/
-    H5AC_cache_config_t
-		mdc_initCacheCfg; /* initial configuration for the      */
-                                /* metadata cache.  This structure is   */
-                                /* fixed at creation time and should    */
-                                /* not change thereafter.               */
-    hid_t       fcpl_id;	/* File creation property list ID 	*/
-    H5F_close_degree_t fc_degree;   /* File close behavior degree	*/
-    size_t	rdcc_nslots;	/* Size of raw data chunk cache (slots)	*/
-    size_t	rdcc_nbytes;	/* Size of raw data chunk cache	(bytes)	*/
-    double	rdcc_w0;	/* Preempt read chunks first? [0.0..1.0]*/
-    size_t      sieve_buf_size; /* Size of the data sieve buffer allocated (in bytes) */
-    hsize_t	threshold;	/* Threshold for alignment		*/
-    hsize_t	alignment;	/* Alignment				*/
-    unsigned	gc_ref;		/* Garbage-collect references?		*/
-    hbool_t	latest_format;	/* Always use the latest format?	*/
-    hbool_t	store_msg_crt_idx;  /* Store creation index for object header messages?	*/
-    unsigned	ncwfs;		/* Num entries on cwfs list		*/
-    struct H5HG_heap_t **cwfs;	/* Global heap cache			*/
-    struct H5G_t *root_grp;	/* Open root group			*/
-    H5FO_t *open_objs;          /* Open objects in file                 */
-    H5RC_t *grp_btree_shared;   /* Ref-counted group B-tree node info   */
+    haddr_t       maxaddr;       /* Maximum address for file             */
+
+    H5AC_t *            cache;              /* The object cache	 		*/
+    H5AC_cache_config_t mdc_initCacheCfg;   /* initial configuration for the      */
+                                            /* metadata cache.  This structure is   */
+                                            /* fixed at creation time and should    */
+                                            /* not change thereafter.               */
+    hid_t                fcpl_id;           /* File creation property list ID 	*/
+    H5F_close_degree_t   fc_degree;         /* File close behavior degree	*/
+    size_t               rdcc_nslots;       /* Size of raw data chunk cache (slots)	*/
+    size_t               rdcc_nbytes;       /* Size of raw data chunk cache	(bytes)	*/
+    double               rdcc_w0;           /* Preempt read chunks first? [0.0..1.0]*/
+    size_t               sieve_buf_size;    /* Size of the data sieve buffer allocated (in bytes) */
+    hsize_t              threshold;         /* Threshold for alignment		*/
+    hsize_t              alignment;         /* Alignment				*/
+    unsigned             gc_ref;            /* Garbage-collect references?		*/
+    hbool_t              latest_format;     /* Always use the latest format?	*/
+    hbool_t              store_msg_crt_idx; /* Store creation index for object header messages?	*/
+    unsigned             ncwfs;             /* Num entries on cwfs list		*/
+    struct H5HG_heap_t **cwfs;              /* Global heap cache			*/
+    struct H5G_t *       root_grp;          /* Open root group			*/
+    H5FO_t *             open_objs;         /* Open objects in file                 */
+    H5RC_t *             grp_btree_shared;  /* Ref-counted group B-tree node info   */
 
     /* File space allocation information */
-    hbool_t     use_tmp_space;  /* Whether temp. file space allocation is allowed */
-    haddr_t	tmp_addr;       /* Next address to use for temp. space in the file */
-    unsigned fs_aggr_merge[H5FD_MEM_NTYPES];    /* Flags for whether free space can merge with aggregator(s) */
-    H5F_fs_state_t fs_state[H5FD_MEM_NTYPES];   /* State of free space manager for each type */
-    haddr_t fs_addr[H5FD_MEM_NTYPES];   /* Address of free space manager info for each type */
-    H5FS_t *fs_man[H5FD_MEM_NTYPES];    /* Free space manager for each file space type */
-    H5FD_mem_t fs_type_map[H5FD_MEM_NTYPES]; /* Mapping of "real" file space type into tracked type */
-    H5F_blk_aggr_t meta_aggr;   /* Metadata aggregation info */
-                                /* (if aggregating metadata allocations) */
-    H5F_blk_aggr_t sdata_aggr;  /* "Small data" aggregation info */
-                                /* (if aggregating "small data" allocations) */
+    hbool_t  use_tmp_space;                   /* Whether temp. file space allocation is allowed */
+    haddr_t  tmp_addr;                        /* Next address to use for temp. space in the file */
+    unsigned fs_aggr_merge[H5FD_MEM_NTYPES];  /* Flags for whether free space can merge with aggregator(s) */
+    H5F_fs_state_t fs_state[H5FD_MEM_NTYPES]; /* State of free space manager for each type */
+    haddr_t        fs_addr[H5FD_MEM_NTYPES];  /* Address of free space manager info for each type */
+    H5FS_t *       fs_man[H5FD_MEM_NTYPES];   /* Free space manager for each file space type */
+    H5FD_mem_t     fs_type_map[H5FD_MEM_NTYPES]; /* Mapping of "real" file space type into tracked type */
+    H5F_blk_aggr_t meta_aggr;                    /* Metadata aggregation info */
+                                                 /* (if aggregating metadata allocations) */
+    H5F_blk_aggr_t sdata_aggr;                   /* "Small data" aggregation info */
+                                                 /* (if aggregating "small data" allocations) */
 
     /* Metadata accumulator information */
-    H5F_meta_accum_t accum;     /* Metadata accumulator info           	*/
+    H5F_meta_accum_t accum; /* Metadata accumulator info           	*/
 };
 
 /*
@@ -253,19 +247,18 @@ struct H5F_file_t {
  * to shared H5F_file_t structs.
  */
 struct H5F_t {
-    char		*open_name;	/* Name used to open file	*/
-    char		*actual_name;	/* Actual name of the file, after resolving symlinks, etc. */
-    char               	*extpath;       /* Path for searching target external link file */
-    H5F_file_t		*shared;	/* The shared file info		*/
-    unsigned		nopen_objs;	/* Number of open object headers*/
-    H5FO_t              *obj_count;     /* # of time each object is opened through top file structure */
-    hid_t               file_id;        /* ID of this file              */
-    hbool_t             closing;        /* File is in the process of being closed */
-    struct H5F_t        *parent;        /* Parent file that this file is mounted to */
-    unsigned            nmounts;        /* Number of children mounted to this file */
+    char *        open_name;   /* Name used to open file	*/
+    char *        actual_name; /* Actual name of the file, after resolving symlinks, etc. */
+    char *        extpath;     /* Path for searching target external link file */
+    H5F_file_t *  shared;      /* The shared file info		*/
+    unsigned      nopen_objs;  /* Number of open object headers*/
+    H5FO_t *      obj_count;   /* # of time each object is opened through top file structure */
+    hid_t         file_id;     /* ID of this file              */
+    hbool_t       closing;     /* File is in the process of being closed */
+    struct H5F_t *parent;      /* Parent file that this file is mounted to */
+    unsigned      nmounts;     /* Number of children mounted to this file */
 };
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
@@ -278,7 +271,6 @@ H5FL_EXTERN(H5F_file_t);
 
 H5_DLLVAR const H5AC_class_t H5AC_SUPERBLOCK[1];
 
-
 /******************************/
 /* Package Private Prototypes */
 /******************************/
@@ -286,61 +278,56 @@ H5_DLLVAR const H5AC_class_t H5AC_SUPERBLOCK[1];
 /* General routines */
 H5_DLL herr_t H5F_init(void);
 H5_DLL herr_t H5F__term_deprec_interface(void);
-H5F_t *H5F_new(H5F_file_t *shared, unsigned flags, hid_t fcpl_id,
-    hid_t fapl_id, H5FD_t *lf);
-herr_t H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush);
+H5F_t *       H5F_new(H5F_file_t *shared, unsigned flags, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf);
+herr_t        H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush);
 H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing);
 H5_DLL htri_t H5F_is_hdf5(const char *name);
-H5_DLL herr_t H5F_get_objects(const H5F_t *f, unsigned types, size_t max_index, hid_t *obj_id_list, hbool_t app_ref, size_t *obj_id_count_ptr);
+H5_DLL herr_t H5F_get_objects(const H5F_t *f, unsigned types, size_t max_index, hid_t *obj_id_list,
+                              hbool_t app_ref, size_t *obj_id_count_ptr);
 H5_DLL herr_t H5F_close(H5F_t *f);
 
 /* File mount related routines */
 H5_DLL herr_t H5F_close_mounts(H5F_t *f);
-H5_DLL int H5F_term_unmount_cb(void *obj_ptr, hid_t obj_id, void *key);
+H5_DLL int    H5F_term_unmount_cb(void *obj_ptr, hid_t obj_id, void *key);
 H5_DLL herr_t H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs);
 
 /* Superblock related routines */
 H5_DLL herr_t H5F_super_init(H5F_t *f, hid_t dxpl_id);
 H5_DLL herr_t H5F_super_read(H5F_t *f, hid_t dxpl_id);
-H5_DLL herr_t H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size,
-    hsize_t *super_ext_info);
+H5_DLL herr_t H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_info);
 H5_DLL herr_t H5F_super_free(H5F_super_t *sblock);
 
 /* Superblock extension related routines */
 H5_DLL herr_t H5F_super_ext_open(H5F_t *f, haddr_t ext_addr, H5O_loc_t *ext_ptr);
 H5_DLL herr_t H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, unsigned id, void *mesg, hbool_t may_create);
-H5_DLL herr_t H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id,
-    hbool_t was_created);
+H5_DLL herr_t H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id, hbool_t was_created);
 
 /* Metadata accumulator routines */
-H5_DLL herr_t H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type,
-    haddr_t addr, size_t size, void *buf);
-H5_DLL herr_t H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type,
-    haddr_t addr, size_t size, const void *buf);
-H5_DLL herr_t H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t type,
-    haddr_t addr, hsize_t size);
+H5_DLL herr_t H5F__accum_read(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, size_t size,
+                              void *buf);
+H5_DLL herr_t H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, size_t size,
+                               const void *buf);
+H5_DLL herr_t H5F__accum_free(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr, hsize_t size);
 H5_DLL herr_t H5F__accum_flush(const H5F_io_info_t *fio_info);
 H5_DLL herr_t H5F__accum_reset(const H5F_io_info_t *fio_info, hbool_t flush);
 
 /* Shared file list related routines */
 H5_DLL herr_t H5F_sfile_add(H5F_file_t *shared);
-H5_DLL H5F_file_t * H5F_sfile_search(H5FD_t *lf);
-H5_DLL herr_t H5F_sfile_remove(H5F_file_t *shared);
+H5_DLL H5F_file_t *H5F_sfile_search(H5FD_t *lf);
+H5_DLL herr_t      H5F_sfile_remove(H5F_file_t *shared);
 
 /* External file cache routines */
 H5_DLL H5F_efc_t *H5F_efc_create(unsigned max_nfiles);
-H5_DLL unsigned H5F_efc_max_nfiles(H5F_efc_t *efc);
-H5_DLL herr_t H5F_efc_release(H5F_efc_t *efc);
-H5_DLL herr_t H5F_efc_destroy(H5F_efc_t *efc);
-H5_DLL herr_t H5F_efc_try_close(H5F_t *f);
+H5_DLL unsigned   H5F_efc_max_nfiles(H5F_efc_t *efc);
+H5_DLL herr_t     H5F_efc_release(H5F_efc_t *efc);
+H5_DLL herr_t     H5F_efc_destroy(H5F_efc_t *efc);
+H5_DLL herr_t     H5F_efc_try_close(H5F_t *f);
 
 /* Testing functions */
 #ifdef H5F_TESTING
-H5_DLL herr_t H5F_get_sohm_mesg_count_test(hid_t fid, unsigned type_id,
-    size_t *mesg_count);
+H5_DLL herr_t H5F_get_sohm_mesg_count_test(hid_t fid, unsigned type_id, size_t *mesg_count);
 H5_DLL herr_t H5F_check_cached_stab_test(hid_t file_id);
 H5_DLL herr_t H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr);
 #endif /* H5F_TESTING */
 
 #endif /* _H5Fpkg_H */
-