[svn-r28624] Minor normalization of H5FA package with revise_chunks.

Tested on:
    Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
    serial only
    (these changes have been in revise_chunks for a long time)

1 files changed, 55 insertions, 55 deletions

diff --git a/src/H5FApkg.h b/src/H5FApkg.h
index ddf3a07..c29322a 100644
--- a/src/H5FApkg.h
+++ b/src/H5FApkg.h
@@ -16,9 +16,9 @@
 /*
  * Programmer:
  *
- * Purpose:	This file contains declarations which are visible only within
- *		the H5FA package.  Source files outside the H5FA package should
- *		include H5FAprivate.h instead.
+ * Purpose:    This file contains declarations which are visible only within
+ *        the H5FA package.  Source files outside the H5FA package should
+ *        include H5FAprivate.h instead.
  */
 #if !(defined(H5FA_FRIEND) | defined(H5FA_MODULE))
 #error "Do not include this file outside the H5FA package!"
@@ -31,8 +31,8 @@
 #include "H5FAprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5FLprivate.h"	/* Free Lists                           */
+#include "H5ACprivate.h"    /* Metadata cache                       */
+#include "H5FLprivate.h"    /* Free Lists                           */
 
 
 /**************************/
@@ -52,11 +52,11 @@
 #define H5FA_SIZEOF_CHKSUM      4
 
 /* "Standard" size of prefix information for fixed array metadata */
-#define H5FA_METADATA_PREFIX_SIZE(c) (                                        \
-    H5_SIZEOF_MAGIC   /* Signature */                                         \
-    + 1 /* Version */                                                         \
-    + 1	/* Array type */                                                \
-    + ((c) ? H5FA_SIZEOF_CHKSUM : 0) /* Metadata checksum */                  \
+#define H5FA_METADATA_PREFIX_SIZE(c) (                                      \
+    H5_SIZEOF_MAGIC                     /* Signature            */          \
+    + 1                                 /* Version              */          \
+    + 1                                 /* Array type           */          \
+    + ((c) ? H5FA_SIZEOF_CHKSUM : 0)    /* Metadata checksum    */          \
     )
 
 /* Size of the Fixed Array header on disk */
@@ -86,25 +86,25 @@
     )
 
 /* Size of the Fixed Array data block prefix on disk */
-#define H5FA_DBLOCK_PREFIX_SIZE(d)  (                                         \
-    /* General metadata fields */                                             \
-    H5FA_METADATA_PREFIX_SIZE(TRUE)                                           \
-                                                                              \
-    /* Sanity-checking fields */                                              \
-    + (d)->hdr->sizeof_addr    	/* File address of Fixed Array header owning the data block */  \
-                                                                              \
-    /* Fixed Array Data Block specific fields */			      \
+#define H5FA_DBLOCK_PREFIX_SIZE(d)  (                                       \
+    /* General metadata fields */                                           \
+    H5FA_METADATA_PREFIX_SIZE(TRUE)                                         \
+                                                                            \
+    /* Sanity-checking fields */                                            \
+    + (d)->hdr->sizeof_addr        /* File address of Fixed Array header owning the data block */   \
+                                                                            \
+    /* Fixed Array Data Block specific fields */                            \
     + (d)->dblk_page_init_size /* Fixed array data block 'page init' bitmasks (can be 0 if no pages) */ \
     )
 
 /* Size of the Fixed Array data block on disk */
-#define H5FA_DBLOCK_SIZE(d)  (					      	      \
-    /* Data block prefix size  */                                             \
-    H5FA_DBLOCK_PREFIX_SIZE(d)                                                \
-                                                                              \
-    /* Fixed Array Elements|Pages of Elements*/				      \
-    + ((d)->hdr->cparam.nelmts * (size_t)(d)->hdr->cparam.raw_elmt_size)      \
-    + ((d)->npages * H5FA_SIZEOF_CHKSUM)        /* Checksum */  	      \
+#define H5FA_DBLOCK_SIZE(d)  (                                              \
+    /* Data block prefix size  */                                           \
+    H5FA_DBLOCK_PREFIX_SIZE(d)                                              \
+                                                                            \
+    /* Fixed Array Elements|Pages of Elements*/                             \
+    + ((d)->hdr->cparam.nelmts * (size_t)(d)->hdr->cparam.raw_elmt_size)    \
+    + ((d)->npages * H5FA_SIZEOF_CHKSUM)        /* Checksum */              \
     )
 
 /* Size of the Fixed Array data block page on disk */
@@ -127,20 +127,20 @@ typedef struct H5FA_hdr_t {
     H5FA_create_t cparam;               /* Creation parameters for Fixed Array */
 
     /* Fixed Array data block information (stored in header) */
-    haddr_t dblk_addr;               	/* Address of Fixed Array Data block */
+    haddr_t dblk_addr;                   /* Address of Fixed Array Data block */
 
     /* Statistics for Fixed Array (stored in header) */
     H5FA_stat_t stats;                  /* Statistcs for Fixed Array */
 
     /* Computed/cached values (not stored in header) */
-    size_t rc;                          /* Reference count of the header */
-    haddr_t addr;                       /* Address of header in file */
-    size_t size;                        /* Size of header in file */
-    H5F_t *f;                           /* Pointer to file for fixed array */
-    size_t file_rc;                     /* Reference count of files using array header */
-    hbool_t pending_delete;             /* Array is pending deletion */
-    size_t sizeof_addr;                 /* Size of file addresses */
-    size_t sizeof_size;                 /* Size of file sizes */
+    size_t rc;                          /* Reference count of the header                                */
+    haddr_t addr;                       /* Address of header in file                                    */
+    size_t size;                        /* Size of header in file                                       */
+    H5F_t *f;                           /* Pointer to file for fixed array                              */
+    size_t file_rc;                     /* Reference count of files using array header                  */
+    hbool_t pending_delete;             /* Array is pending deletion                                    */
+    size_t sizeof_addr;                 /* Size of file addresses                                       */
+    size_t sizeof_size;                 /* Size of file sizes                                           */
 
     /* Client information (not stored) */
     void *cb_ctx;                       /* Callback context */
@@ -152,22 +152,22 @@ typedef struct H5FA_dblock_t {
     H5AC_info_t cache_info;
 
     /* Fixed array information (stored) */
-    uint8_t     *dblk_page_init;/* Bitmap of whether a data block page is initialized */
-    void        *elmts;         /* Buffer for elements stored in data block  */
+    uint8_t     *dblk_page_init;/* Bitmap of whether a data block page is initialized       */
+    void        *elmts;         /* Buffer for elements stored in data block                 */
 
     /* Internal array information (not stored) */
-    H5FA_hdr_t	*hdr;	        /* Shared array header info	              */
+    H5FA_hdr_t    *hdr;            /* Shared array header info                              */
 
     /* Computed/cached values (not stored) */
-    haddr_t     addr;           /* Address of this data block on disk	      */
-    hsize_t     size;           /* Size of data block on disk		      */
-    size_t      npages;         /* Nummber of pages in data block (zero if not paged) */
-    size_t      last_page_nelmts;  /* Nummber of elements in last page, if paged */
+    haddr_t     addr;               /* Address of this data block on disk                   */
+    hsize_t     size;               /* Size of data block on disk                           */
+    size_t      npages;             /* Nummber of pages in data block (zero if not paged)   */
+    size_t      last_page_nelmts;   /* Nummber of elements in last page, if paged           */
 
     /* Fixed Array data block information (not stored) */
-    size_t dblk_page_nelmts;         	/* # of elements per data block page */
-    size_t dblk_page_size; 		/* Size of a data block page */
-    size_t dblk_page_init_size;    	/* Size of 'page init' bitmask */
+    size_t dblk_page_nelmts;        /* # of elements per data block page                    */
+    size_t dblk_page_size;          /* Size of a data block page                            */
+    size_t dblk_page_init_size;     /* Size of 'page init' bitmask                          */
 } H5FA_dblock_t;
 
 /* The fixed array data block page information */
@@ -179,18 +179,18 @@ typedef struct H5FA_dbk_page_t {
     void        *elmts;         /* Buffer for elements stored in data block page */
 
     /* Internal array information (not stored) */
-    H5FA_hdr_t	*hdr;	        /* Shared array header info	              */
+    H5FA_hdr_t    *hdr;         /* Shared array header info                     */
 
     /* Computed/cached values (not stored) */
-    haddr_t     addr;           /* Address of this data block page on disk    */
-    size_t      size;           /* Size of data block page on disk	      */
-    size_t      nelmts;         /* Number of elements in data block page      */
+    haddr_t     addr;           /* Address of this data block page on disk      */
+    size_t      size;           /* Size of data block page on disk              */
+    size_t      nelmts;         /* Number of elements in data block page        */
 } H5FA_dblk_page_t;
 
 /* Fixed array */
 struct H5FA_t {
-    H5FA_hdr_t  *hdr;           /* Pointer to internal fixed array header info 	*/
-    H5F_t      *f;              /* Pointer to file for fixed array 		*/
+    H5FA_hdr_t  *hdr;           /* Pointer to internal fixed array header info  */
+    H5F_t      *f;              /* Pointer to file for fixed array              */
 };
 
 
@@ -205,14 +205,14 @@ typedef struct H5FA_hdr_cache_ud_t {
 
 /* Info needed for loading data block */
 typedef struct H5FA_dblock_cache_ud_t {
-    H5FA_hdr_t *hdr;            /* Shared fixed array information */
-    haddr_t     dblk_addr;      /* Address of data block on disk */
+    H5FA_hdr_t *hdr;            /* Shared fixed array information       */
+    haddr_t     dblk_addr;      /* Address of data block on disk        */
 } H5FA_dblock_cache_ud_t;
 
 /* Info needed for loading data block page */
 typedef struct H5FA_dblk_page_cache_ud_t {
-    H5FA_hdr_t *hdr;            /* Shared fixed array information */
-    size_t      nelmts;         /* Number of elements in data block page */
+    H5FA_hdr_t *hdr;            /* Shared fixed array information           */
+    size_t nelmts;              /* Number of elements in data block page    */
     haddr_t     dblk_page_addr; /* Address of data block page on disk */
 } H5FA_dblk_page_cache_ud_t;
 
@@ -234,7 +234,7 @@ H5_DLLVAR const H5AC_class_t H5AC_FARRAY_DBLK_PAGE[1];
 H5_DLLVAR const H5FA_class_t H5FA_CLS_TEST[1];
 
 /* Array of fixed array client ID -> client class mappings */
-extern const H5FA_class_t *const H5FA_client_class_g[H5FA_NUM_CLS_ID];
+H5_DLLVAR const H5FA_class_t *const H5FA_client_class_g[H5FA_NUM_CLS_ID];
 
 
 /******************************/