[svn-r27085] Description:

    Bring r26195 from trunk to 1.8 branch (minus public API changes):

    Switch from enum H5D_CHUNK_BTREE to H5D_CHUNK_IDX_BTREE, along with a couple
of minor whitespace touchups.

Tested on:
    MacOSX/64 10.10.3 (amazon) w/serial & parallel
    (tested on trunk for 2+ weeks)

3 files changed, 6 insertions, 6 deletions

diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c
index af91753..18738dd 100644
--- a/src/H5Dbtree.c
+++ b/src/H5Dbtree.c
@@ -195,7 +195,7 @@ H5B_class_t H5B_BTREE[1] = {{
     H5D__btree_remove,		/*remove		*/
     H5D__btree_decode_key,	/*decode		*/
     H5D__btree_encode_key,	/*encode		*/
-    H5D__btree_debug_key,	/*debug			*/
+    H5D__btree_debug_key	/*debug			*/
 }};
 
 
@@ -868,7 +868,7 @@ done:
 static herr_t
 H5D__btree_idx_create(const H5D_chk_idx_info_t *idx_info)
 {
-    H5D_chunk_common_ud_t udata;             /* User data for B-tree callback */
+    H5D_chunk_common_ud_t udata;        /* User data for B-tree callback */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_STATIC
@@ -939,7 +939,7 @@ H5D__btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
 static herr_t
 H5D__btree_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata)
 {
-    herr_t	ret_value = SUCCEED;		/* Return value */
+    herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1111,7 +1111,7 @@ H5D__btree_idx_iterate(const H5D_chk_idx_info_t *idx_info,
 static herr_t
 H5D__btree_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *udata)
 {
-    herr_t	ret_value = SUCCEED;		/* Return value */
+    herr_t	ret_value = SUCCEED;	/* Return value */
 
     FUNC_ENTER_STATIC
 
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 5a785a3..6128d7e 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -362,7 +362,7 @@ typedef struct H5D_chunk_map_t {
 } H5D_chunk_map_t;
 
 /* Cached information about a particular chunk */
-typedef struct H5D_chunk_cached_t{
+typedef struct H5D_chunk_cached_t {
     hbool_t     valid;                          /*whether cache info is valid*/
     hsize_t	offset[H5O_LAYOUT_NDIMS];	/*logical offset to start*/
     uint32_t	nbytes;				/*size of stored data	*/
diff --git a/src/H5VM.c b/src/H5VM.c
index 6f72c57..a1eafb6 100644
--- a/src/H5VM.c
+++ b/src/H5VM.c
@@ -1089,7 +1089,7 @@ H5VM_array_offset_pre(unsigned n, const hsize_t *acc, const hsize_t *offset)
     HDassert(offset);
 
     /* Compute offset in array */
-    for (i=(int)(n-1), ret_value=0; i>=0; --i)
+    for(i = (int)(n - 1), ret_value = 0; i >= 0; --i)
         ret_value += acc[i] * offset[i];
 
     FUNC_LEAVE_NOAPI(ret_value)