[svn-r18032] Description:

	Bring r18031 from trunk to 1.8 branch:

	Bring r18030 from merge_metadata_journaling branch to trunk:

	Bring "brush clearing" changes (whitespace & style issues, mostly) from
metadata_journaling branch to the "merging" branch, to converge the trunk and
the metadata_journaling branch.

	Also, some other minor cleanups along the way.

Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
       FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
	(h5committested on trunk)

10 files changed, 26 insertions, 29 deletions

diff --git a/test/gen_bad_ohdr.c b/test/gen_bad_ohdr.c
index d04996d..6d50230 100644
--- a/test/gen_bad_ohdr.c
+++ b/test/gen_bad_ohdr.c
@@ -28,10 +28,12 @@
 #include "H5private.h"
 #include "H5Oprivate.h"
 
+#ifdef H5O_ENABLE_BAD_MESG_COUNT
 #define FILENAME "tbad_msg_count.h5"
 #define GROUPNAME "Group"
 #define ATTRNAME1 "Attribute #1"
 #define ATTRNAME2 "Attribute #2"
+#endif /* H5O_ENABLE_BAD_MESG_COUNT */
 
 #ifndef TRUE
 #define TRUE 1
diff --git a/test/gen_bogus.c b/test/gen_bogus.c
index a8b88bf..7456ae6 100644
--- a/test/gen_bogus.c
+++ b/test/gen_bogus.c
@@ -25,7 +25,9 @@
 #include "hdf5.h"
 #include "H5Oprivate.h"
 
+#ifdef H5O_ENABLE_BOGUS
 #define FILENAME "tbogus.h5"
+#endif /* H5O_ENABLE_BOGUS */
 
 #ifndef TRUE
 #define TRUE 1
diff --git a/test/gen_deflate.c b/test/gen_deflate.c
index 16de92e..2d0b746 100644
--- a/test/gen_deflate.c
+++ b/test/gen_deflate.c
@@ -66,7 +66,7 @@ main(void)
     /* (Try for something easily compressible) */
     for(i=0; i<SPACE_DIM1; i++)
         for(j=0; j<SPACE_DIM2; j++)
-            data[i][j]=j%5;
+            data[i][j] = (int)(j % 5);
 
     /* Create the file */
     file = H5Fcreate(TESTFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
diff --git a/test/gen_noencoder.c b/test/gen_noencoder.c
index 3266374..46a2036 100644
--- a/test/gen_noencoder.c
+++ b/test/gen_noencoder.c
@@ -79,5 +79,7 @@ main(void)
     H5Dclose(dset_id);
     H5Sclose(space_id);
     H5Fclose(file_id);
+
+    return(0);
 }
 
diff --git a/test/lheap.c b/test/lheap.c
index 537d42d..b6591ef 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -76,7 +76,7 @@ main(void)
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
     if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0)
 	goto error;
-    if(NULL == (f = H5I_object(file))) {
+    if(NULL == (f = (H5F_t *)H5I_object(file))) {
 	H5_FAILED();
 	H5Eprint2(H5E_DEFAULT, stdout);
 	goto error;
@@ -93,16 +93,18 @@ main(void)
     }
     for(i = 0; i < NOBJS; i++) {
         sprintf(buf, "%03d-", i);
-        for (j=4; j<i; j++) buf[j] = '0' + j%10;
-        if (j>4) buf[j] = '\0';
+        for(j = 4; j < i; j++)
+            buf[j] = '0' + j % 10;
+        if(j > 4)
+            buf[j] = '\0';
 
-        if ((size_t)(-1)==(obj[i]=H5HL_insert(f, H5P_DATASET_XFER_DEFAULT, heap, strlen(buf)+1, buf))) {
+        if((size_t)(-1) == (obj[i] = H5HL_insert(f, H5P_DATASET_XFER_DEFAULT, heap, strlen(buf) + 1, buf))) {
 	    H5_FAILED();
 	    H5Eprint2(H5E_DEFAULT, stdout);
 	    goto error;
 	}
     }
-    if (H5HL_unprotect(f, H5P_DATASET_XFER_DEFAULT, heap, heap_addr) < 0) {
+    if(H5HL_unprotect(f, H5P_DATASET_XFER_DEFAULT, heap, heap_addr) < 0) {
         H5_FAILED();
         H5Eprint2(H5E_DEFAULT, stdout);
         goto error;
@@ -116,16 +118,18 @@ main(void)
 
     TESTING("local heap read");
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-    if ((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl))<0) goto error;
-    if (NULL==(f=H5I_object(file))) {
+    if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) goto error;
+    if(NULL == (f = (H5F_t *)H5I_object(file))) {
         H5_FAILED();
         H5Eprint2(H5E_DEFAULT, stdout);
         goto error;
     }
-    for (i=0; i<NOBJS; i++) {
+    for(i = 0; i < NOBJS; i++) {
         sprintf(buf, "%03d-", i);
-        for (j=4; j<i; j++) buf[j] = '0' + j%10;
-        if (j>4) buf[j] = '\0';
+        for(j = 4; j < i; j++)
+            buf[j] = '0' + j % 10;
+        if(j > 4)
+            buf[j] = '\0';
 
         if (NULL == (heap = H5HL_protect(f, H5P_DATASET_XFER_DEFAULT, heap_addr, H5AC_READ))) {
             H5_FAILED();
@@ -133,7 +137,7 @@ main(void)
             goto error;
         }
 
-        if (NULL == (s = H5HL_offset_into(f, heap, obj[i]))) {
+        if (NULL == (s = (const char *)H5HL_offset_into(f, heap, obj[i]))) {
             H5_FAILED();
             H5Eprint2(H5E_DEFAULT, stdout);
             goto error;
@@ -147,7 +151,7 @@ main(void)
             goto error;
         }
 
-        if (H5HL_unprotect(f, H5P_DATASET_XFER_DEFAULT, heap, heap_addr) < 0) {
+        if(H5HL_unprotect(f, H5P_DATASET_XFER_DEFAULT, heap, heap_addr) < 0) {
             H5_FAILED();
             H5Eprint2(H5E_DEFAULT, stdout);
             goto error;
@@ -168,3 +172,4 @@ main(void)
     } H5E_END_TRY;
     return 1;
 }
+
diff --git a/test/ohdr.c b/test/ohdr.c
index 16ffc7c..f59dace 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -441,6 +441,8 @@ main(void)
             /* Open the dataset with the "mark if unknown" message */
             if((dset = H5Dopen2(file, "/Dataset3", H5P_DEFAULT)) < 0)
                 TEST_ERROR
+
+            /* Close the dataset */
             if(H5Dclose(dset) < 0)
                 TEST_ERROR
 
diff --git a/test/tarray.c b/test/tarray.c
index cc0a0ca..590d48c 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -44,16 +44,9 @@
 #define ARRAY3_DIM2 3
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE1_NAME  "Space1"
 #define SPACE1_RANK	1
 #define SPACE1_DIM1	4
 
-/* 2-D dataset with fixed dimensions */
-#define SPACE2_NAME  "Space2"
-#define SPACE2_RANK	2
-#define SPACE2_DIM1	10
-#define SPACE2_DIM2	10
-
 /****************************************************************
 **
 **  test_array_atomic_1d(): Test basic array datatype code.
diff --git a/test/tattr.c b/test/tattr.c
index 432db67..d84231e 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -57,7 +57,6 @@
 #define CORDER_ITER_STOP            3
 
 /* 3-D dataset with fixed dimensions */
-#define SPACE1_NAME  "Space1"
 #define SPACE1_RANK	3
 #define SPACE1_DIM1	3
 #define SPACE1_DIM2	15
diff --git a/test/th5s.c b/test/th5s.c
index 5bf7845..e21dee2 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -39,14 +39,12 @@
 #define NULLATTR   "null_attribute"
 
 /* 3-D dataset with fixed dimensions */
-#define SPACE1_NAME  "Space1"
 #define SPACE1_RANK	3
 #define SPACE1_DIM1	3
 #define SPACE1_DIM2	15
 #define SPACE1_DIM3	13
 
 /* 4-D dataset with one unlimited dimension */
-#define SPACE2_NAME  "Space2"
 #define SPACE2_RANK	4
 #define SPACE2_DIM1	0
 #define SPACE2_DIM2	15
@@ -58,13 +56,10 @@
 #define SPACE2_MAX4	23
 
 /* Scalar dataset with simple datatype */
-#define SPACE3_NAME  "Scalar1"
 #define SPACE3_RANK	0
 unsigned space3_data=65;
 
 /* Scalar dataset with compound datatype */
-#define SPACE4_NAME  "Scalar2"
-#define SPACE4_RANK	0
 #define SPACE4_FIELDNAME1	"c1"
 #define SPACE4_FIELDNAME2	"u"
 #define SPACE4_FIELDNAME3	"f"
diff --git a/test/trefer.c b/test/trefer.c
index bf9692f..dbf12bc 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -30,18 +30,15 @@
 #define FILE3	"trefer3.h5"
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE1_NAME  "Space1"
 #define SPACE1_RANK	1
 #define SPACE1_DIM1	4
 
 /* 2-D dataset with fixed dimensions */
-#define SPACE2_NAME  "Space2"
 #define SPACE2_RANK	2
 #define SPACE2_DIM1	10
 #define SPACE2_DIM2	10
 
 /* Larger 1-D dataset with fixed dimensions */
-#define SPACE3_NAME  "Space3"
 #define SPACE3_RANK	1
 #define SPACE3_DIM1	100