Brings a lot of smaller changes from develop

6 files changed, 60 insertions, 58 deletions

diff --git a/src/H5ACmodule.h b/src/H5ACmodule.h
index b7fc48f..d1f9697 100644
--- a/src/H5ACmodule.h
+++ b/src/H5ACmodule.h
@@ -11,15 +11,15 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol <koziol@hdfgroup.org>
+ * Programmer:	Quincey Koziol
  *		Saturday, September 12, 2015
  *
  * Purpose:	This file contains declarations which define macros for the
  *		H5AC package.  Including this header means that the source file
  *		is part of the H5AC package.
  */
-#ifndef _H5ACmodule_H
-#define _H5ACmodule_H
+#ifndef H5ACmodule_H
+#define H5ACmodule_H
 
 /* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
  *      reporting macros.
@@ -29,4 +29,4 @@
 #define H5_MY_PKG_ERR  H5E_CACHE
 #define H5_MY_PKG_INIT YES
 
-#endif /* _H5ACmodule_H */
+#endif /* H5ACmodule_H */
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 66f590f..e320f72 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -13,12 +13,12 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:		H5ACprivate.h
- *			Jul  9 1997
- *			Robb Matzke <matzke@llnl.gov>
+ * Created:   H5ACprivate.h
+ *            Jul  9 1997
+ *            Robb Matzke
  *
- * Purpose:		Constants and typedefs available to the rest of the
- *			library.
+ * Purpose:   Constants and typedefs available to the rest of the
+ *            library.
  *
  *-------------------------------------------------------------------------
  */
@@ -26,14 +26,14 @@
 #ifndef H5ACprivate_H
 #define H5ACprivate_H
 
-#include "H5ACpublic.h" /*public prototypes			*/
+#include "H5ACpublic.h" /*public prototypes            */
 
 /* Pivate headers needed by this header */
-#include "H5private.h"   /* Generic Functions			*/
-#include "H5Cprivate.h"  /* Cache				*/
-#include "H5Fprivate.h"  /* File access				*/
-#include "H5Pprivate.h"  /* Property lists			*/
-#include "H5SLprivate.h" /* Skip lists 				*/
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Cprivate.h"  /* Cache                */
+#include "H5Fprivate.h"  /* File access                */
+#include "H5Pprivate.h"  /* Property lists            */
+#include "H5SLprivate.h" /* Skip lists                 */
 
 /* Global metadata tag values */
 #define H5AC__INVALID_TAG    (haddr_t)0
@@ -90,20 +90,20 @@ typedef enum {
  *
  * NOTE: test/cache plays games with the f->shared->cache, and thus
  *       setting H5AC_DUMP_STATS_ON_CLOSE will generate constant,
- *	 irrelevant data when run with that test program.  See
- * 	 comments on setup_cache() / takedown_cache() in test/cache_common.c.
+ *       irrelevant data when run with that test program.  See
+ *       comments on setup_cache() / takedown_cache() in test/cache_common.c.
  *       for details.
  *
- *	 If you need to dump stats at file close in test/cache.c,
- *	 use the dump_stats parameter to takedown_cache(), or call
- *	 H5C_stats() directly.
- *					JRM -- 4/12/15
+ *     If you need to dump stats at file close in test/cache.c,
+ *     use the dump_stats parameter to takedown_cache(), or call
+ *     H5C_stats() directly.
+ *                    JRM -- 4/12/15
  *
  * Added the H5AC_DUMP_IMAGE_STATS_ON_CLOSE #define, which works much
  * the same way as H5AC_DUMP_STATS_ON_CLOSE.  However, the set of stats
  * displayed is much smaller, and directed purely at the cache image feature.
  *
- *					JRM -- 11/1/15
+ *                    JRM -- 11/1/15
  */
 #if H5C_COLLECT_CACHE_STATS
 
@@ -132,7 +132,7 @@ typedef enum {
 #endif
 
 /*
- * Class methods pertaining to caching.	 Each type of cached object will
+ * Class methods pertaining to caching. Each type of cached object will
  * have a constant variable with permanent life-span that describes how
  * to cache the object.
  */
diff --git a/src/H5Bpkg.h b/src/H5Bpkg.h
index 0f61461..0a79628 100644
--- a/src/H5Bpkg.h
+++ b/src/H5Bpkg.h
@@ -12,12 +12,12 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol
- *		Thursday, May 15, 2003
+ * Programmer:    Quincey Koziol
+ *        Thursday, May 15, 2003
  *
- * Purpose:	This file contains declarations which are visible only within
- *		the H5B package.  Source files outside the H5B package should
- *		include H5Bprivate.h instead.
+ * Purpose:    This file contains declarations which are visible only within
+ *        the H5B package.  Source files outside the H5B package should
+ *        include H5Bprivate.h instead.
  */
 #if !(defined H5B_FRIEND || defined H5B_MODULE)
 #error "Do not include this file outside the H5B package!"
@@ -30,7 +30,7 @@
 #include "H5Bprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5ACprivate.h" /* Metadata cache            */
 #include "H5FLprivate.h" /* Free Lists                           */
 
 /**************************/
@@ -49,20 +49,20 @@
 typedef struct H5B_t {
     H5AC_info_t cache_info; /* Information for H5AC cache functions */
                             /* _must_ be first field in structure */
-    H5UC_t * rc_shared;     /*ref-counted shared info	     */
-    unsigned level;         /*node level			     */
-    unsigned nchildren;     /*number of child pointers	     */
-    haddr_t  left;          /*address of left sibling	     */
-    haddr_t  right;         /*address of right sibling	     */
+    H5UC_t * rc_shared;     /*ref-counted shared info         */
+    unsigned level;         /*node level                 */
+    unsigned nchildren;     /*number of child pointers         */
+    haddr_t  left;          /*address of left sibling         */
+    haddr_t  right;         /*address of right sibling         */
     uint8_t *native;        /*array of keys in native format     */
-    haddr_t *child;         /*2k child pointers		     */
+    haddr_t *child;         /*2k child pointers             */
 } H5B_t;
 
 /* Callback info for loading a B-tree node into the cache */
 typedef struct H5B_cache_ud_t {
     H5F_t *                   f;         /* File that B-tree node is within   */
-    const struct H5B_class_t *type;      /* Type of tree			     */
-    H5UC_t *                  rc_shared; /* Ref-counted shared info	     */
+    const struct H5B_class_t *type;      /* Type of tree                 */
+    H5UC_t *                  rc_shared; /* Ref-counted shared info         */
 } H5B_cache_ud_t;
 
 /*****************************/
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 5c3549f..99ba4bd 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -17,13 +17,13 @@
  * Purpose:     This file contains declarations which are normally visible
  *              only within the H5C package.
  *
- *		Source files outside the H5C package should include
- *		H5Cprivate.h instead.
+ *        Source files outside the H5C package should include
+ *        H5Cprivate.h instead.
  *
- *		The one exception to this rule is test/cache.c.  The test
- *		code is easier to write if it can look at the cache's
- *		internal data structures.  Indeed, this is the main
- *		reason why this file was created.
+ *        The one exception to this rule is test/cache.c.  The test
+ *        code is easier to write if it can look at the cache's
+ *        internal data structures.  Indeed, this is the main
+ *        reason why this file was created.
  */
 
 /* clang-format off */
@@ -40,15 +40,16 @@
 #include "H5Cprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5Clog.h"      /* Cache logging */
-#include "H5SLprivate.h" /* Skip lists */
+#include "H5Clog.h"             /* Cache logging */
+#include "H5SLprivate.h"        /* Skip lists */
 
 /**************************/
 /* Package Private Macros */
 /**************************/
 
 /* Number of epoch markers active */
-#define H5C__MAX_EPOCH_MARKERS 10
+#define H5C__MAX_EPOCH_MARKERS                  10
+
 
 /* Cache configuration settings */
 #define H5C__HASH_TABLE_LEN      (64 * 1024) /* must be a power of 2 */
@@ -76,7 +77,7 @@
  * to the HGOTO_ERROR macro, which may not be appropriate in all cases.
  * If so, we will need versions of the insertion and deletion macros which
  * do not reference the sanity checking macros.
- *							JRM - 5/5/04
+ *                            JRM - 5/5/04
  *
  * Changes:
  *
@@ -151,14 +152,14 @@
  *    sanity checking macros.  These macro are used to update the size of
  *    a DLL when one of its entries changes size.
  *
- *							JRM - 9/8/05
+ *                            JRM - 9/8/05
  *
  *  - Added macros supporting the index list -- a doubly liked list of
  *    all entries in the index.  This list is necessary to reduce the
  *    cost of visiting all entries in the cache, which was previously
  *    done via a scan of the hash table.
  *
- *							JRM - 10/15/15
+ *                            JRM - 10/15/15
  *
  ****************************************************************************/
 
@@ -799,6 +800,7 @@
 
 #endif /* H5C_COLLECT_CACHE_STATS */
 
+
 /***********************************************************************
  *
  * Hash table access and manipulation macros:
@@ -815,13 +817,13 @@
  *     the clean_index_size and dirty_index_size fields of H5C_t.  Also
  *     added macros to allow us to track entry cleans and dirties.
  *
- *     						JRM -- 11/5/08
+ *                             JRM -- 11/5/08
  *
  *   - Updated existing index macros and sanity check macros to maintain
  *     the index_ring_len, index_ring_size, clean_index_ring_size, and
  *     dirty_index_ring_size fields of H5C_t.
  *
- *						JRM -- 9/1/15
+ *                        JRM -- 9/1/15
  *
  *   - Updated existing index macros and sanity checks macros to
  *     maintain an doubly linked list of all entries in the index.
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index a640c6a..0c827c6 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -26,11 +26,11 @@
 #ifndef H5Cprivate_H
 #define H5Cprivate_H
 
-#include "H5Cpublic.h" /* public prototypes		        */
+#include "H5Cpublic.h" /* public prototypes            */
 
 /* Private headers needed by this header */
-#include "H5private.h"  /* Generic Functions			*/
-#include "H5Fprivate.h" /* File access				*/
+#include "H5private.h"  /* Generic Functions            */
+#include "H5Fprivate.h" /* File access                  */
 
 /**************************/
 /* Library Private Macros */
@@ -44,7 +44,7 @@
  * or decrease it if appropriate.  Its purposes is to detect corrupt
  * object sizes, so it probably doesn't matter if it is a bit big.
  *
- *					JRM - 5/17/04
+ *                    JRM - 5/17/04
  */
 #define H5C_MAX_ENTRY_SIZE ((size_t)(32 * 1024 * 1024))
 
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index 8862362..f642f41 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -315,9 +315,9 @@ typedef struct H5FD_free_t {
  * are declared here and the driver appends private fields in memory.
  */
 struct H5FD_t {
-    hid_t               driver_id;     /* Driver ID for this file */
-    const H5FD_class_t *cls;           /* Constant class info */
-    unsigned long       fileno;        /* File 'serial' number */
+    hid_t               driver_id;     /*driver ID for this file   */
+    const H5FD_class_t *cls;           /*constant class info       */
+    unsigned long       fileno;        /* File 'serial' number     */
     unsigned            access_flags;  /* File access flags (from create or open) */
     unsigned long       feature_flags; /* VFL Driver feature Flags */
     haddr_t             maxaddr;       /* For this file, overrides class */