[svn-r20146] Description:

	Bring r19714:20145 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.6 (amazon) in debug mode
        Mac OS X/32 10.6.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

1 files changed, 17 insertions, 22 deletions

diff --git a/test/bittests.c b/test/bittests.c
index e435d6c..f063cee 100644
--- a/test/bittests.c
+++ b/test/bittests.c
@@ -908,41 +908,36 @@ test_clear (void)
  * Programmer:	Robb Matzke
  *              Tuesday, June 16, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
-main (void)
+main(void)
 {
-    int	nerrors=0;
+    int	nerrors = 0;
 
     /*
-     * Open the library explicitly for thread-safe builds, so per-thread
-     * things are initialized correctly.
+     * Open the library explicitly.
      */
-#ifdef H5_HAVE_THREADSAFE
     H5open();
-#endif  /* H5_HAVE_THREADSAFE */
-
-    nerrors += test_find ()<0?1:0;
-    nerrors += test_set  ()<0?1:0;
-    nerrors += test_clear()<0?1:0;
-    nerrors += test_copy ()<0?1:0;
-    nerrors += test_shift()<0?1:0;
-    nerrors += test_increment  ()<0?1:0;
-    nerrors += test_decrement  ()<0?1:0;
-    nerrors += test_negate  ()<0?1:0;
-
-    if (nerrors) {
+
+    nerrors += test_find() < 0 ? 1 : 0;
+    nerrors += test_set() < 0 ? 1 : 0;
+    nerrors += test_clear() < 0 ? 1 : 0;
+    nerrors += test_copy() < 0 ? 1 : 0;
+    nerrors += test_shift() < 0 ? 1 : 0;
+    nerrors += test_increment() < 0 ? 1 : 0;
+    nerrors += test_decrement() < 0 ? 1 : 0;
+    nerrors += test_negate() < 0 ? 1 : 0;
+
+    if(nerrors) {
         printf("***** %u FAILURE%s! *****\n",
-               nerrors, 1==nerrors?"":"S");
+               nerrors, 1 == nerrors ? "" : "S");
         exit(1);
     }
     printf("All bit tests passed.\n");
 
-#ifdef H5_HAVE_THREADSAFE
     H5close();
-#endif  /* H5_HAVE_THREADSAFE */
+
     return 0;
 }
+