[svn-r18105] Description:

        Minor brush-clearing changes to converge metadata_journaling branch and
trunk.

Tested on:
        Mac OS X/32 10.6.2 (amazon) debug & prod
        (h5committest not required on this branch)

6 files changed, 9 insertions, 13 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index fc4ea4d..59b2e60 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -510,11 +510,11 @@ H5AC_create(const H5F_t *f,
 
     FUNC_ENTER_NOAPI(H5AC_create, FAIL)
 
-    HDassert ( f );
-    HDassert ( NULL == f->shared->cache );
-    HDassert ( config_ptr != NULL ) ;
-    HDassert ( NELMTS(H5AC_entry_type_names) == H5AC_NTYPES);
-    HDassert ( H5C__MAX_NUM_TYPE_IDS == H5AC_NTYPES);
+    HDassert(f);
+    HDassert(NULL == f->shared->cache);
+    HDassert(config_ptr != NULL);
+    HDcompile_assert(NELMTS(H5AC_entry_type_names) == H5AC_NTYPES);
+    HDcompile_assert(H5C__MAX_NUM_TYPE_IDS == H5AC_NTYPES);
 
     result = H5AC_validate_config(config_ptr);
 
diff --git a/src/H5Atest.c b/src/H5Atest.c
index 1fbaa42..7c4f886 100644
--- a/src/H5Atest.c
+++ b/src/H5Atest.c
@@ -37,7 +37,7 @@
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache                       */
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5SMprivate.h"        /* Shared object header messages        */
diff --git a/src/H5D.c b/src/H5D.c
index e00dd2d..d78a1bb 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -28,7 +28,6 @@
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
 #include "H5Dpkg.h"		/* Datasets 				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free lists                           */
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index dac3090..8f53ec2 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -42,7 +42,6 @@
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5ACprivate.h"	/* Metadata cache			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
 #include "H5Dpkg.h"		/* Datasets 				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index 2e1b6af..2089bed 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -227,7 +227,6 @@ typedef struct H5G_bt_it_cpy_t {
 /* Common information for "by index" lookups in symbol tables */
 typedef struct H5G_bt_it_idx_common_t {
     /* downward */
-    H5F_t       *f;             /* Pointer to file that symbol table is in */
     hsize_t     idx;            /* Index of group member to be queried */
     hsize_t     num_objs;       /* The number of objects having been traversed */
     H5G_bt_find_op_t op;        /* Operator to call when correct entry is found */
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index fcb573d..2b1476d 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -55,6 +55,7 @@ typedef struct H5G_bt_it_gnbi_t {
 typedef struct H5G_bt_it_gtbi_t {
     /* downward */
     H5G_bt_it_idx_common_t common; /* Common information for "by index" lookup  */
+    H5F_t       *f;             /* Pointer to file that symbol table is in */
     hid_t       dxpl_id;        /* DXPL for operation */
 
     /* upward */
@@ -733,7 +734,6 @@ H5G_stab_get_name_by_idx(H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n,
     } /* end if */
 
     /* Set iteration information */
-    udata.common.f = oloc->file;
     udata.common.idx = n;
     udata.common.num_objs = 0;
     udata.common.op = H5G_stab_get_name_by_idx_cb;
@@ -956,7 +956,6 @@ H5G_stab_lookup_by_idx(H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
     } /* end if */
 
     /* Set iteration information */
-    udata.common.f = grp_oloc->file;
     udata.common.idx = n;
     udata.common.num_objs = 0;
     udata.common.op = H5G_stab_lookup_by_idx_cb;
@@ -1020,7 +1019,7 @@ H5G_stab_get_type_by_idx_cb(const H5G_entry_t *ent, void *_udata)
                 H5O_type_t obj_type;            /* Type of object at location */
 
                 /* Build temporary object location */
-                tmp_oloc.file = udata->common.f;
+                tmp_oloc.file = udata->f;
                 HDassert(H5F_addr_defined(ent->header));
                 tmp_oloc.addr = ent->header;
 
@@ -1069,10 +1068,10 @@ H5G_stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
 	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "unable to determine local heap address")
 
     /* Set iteration information */
-    udata.common.f = oloc->file;
     udata.common.idx = idx;
     udata.common.num_objs = 0;
     udata.common.op = H5G_stab_get_type_by_idx_cb;
+    udata.f = oloc->file;
     udata.dxpl_id = dxpl_id;
     udata.type = H5G_UNKNOWN;