[svn-r16714] Description:

    Clean up code, remove unused variables, remove "naked" printf()s, make
h5recover test script work in 'srcdir' build, etc.  (The h5recover tests are
failing still and the script prints "PASSED" when it doesn't, but we'll work on
that more next)

Tested on:
    Mac OS X/32 10.5.6 (amazon)

9 files changed, 68 insertions, 292 deletions

diff --git a/src/H5C2.c b/src/H5C2.c
index d8e4a51..2115d92 100644
--- a/src/H5C2.c
+++ b/src/H5C2.c
@@ -1932,15 +1932,6 @@ H5C2_flush_to_min_clean(H5F_t * f,
             entry_ptr = entry_ptr->aux_prev;
         }
 
-        if ( ( flushed_entries_count > cache_ptr->slist_len) ||
-             ( flushed_entries_size < space_needed ) ) {
-            HDfprintf(stdout, "flushed_entries_count = %d <= %d = slist_size\n",
-                      (int)flushed_entries_count, (int)(cache_ptr->slist_size));
-            HDfprintf(stdout,
-                      "flushed_entries_size = %d < %d = space_needed.\n",
-                      (int)flushed_entries_size, (int)space_needed);
-        }
-
         HDassert( flushed_entries_count <= cache_ptr->slist_len );
         HDassert( flushed_entries_size >= space_needed );
 
@@ -9753,13 +9744,11 @@ H5C2_validate_lru_list(H5C2_t * cache_ptr)
          ( cache_ptr->LRU_head_ptr != cache_ptr->LRU_tail_ptr )
        ) {
 
-        HDfprintf(stdout,"H5C2_validate_lru_list: Check 1 failed.\n");
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 1 failed")
     }
 
     if ( ( cache_ptr->LRU_list_len < 0 ) || ( cache_ptr->LRU_list_size < 0 ) ) {
 
-        HDfprintf(stdout,"H5C2_validate_lru_list: Check 2 failed.\n");
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 2 failed")
     }
 
@@ -9773,7 +9762,6 @@ H5C2_validate_lru_list(H5C2_t * cache_ptr)
          )
        ) {
 
-        HDfprintf(stdout,"H5C2_validate_lru_list: Check 3 failed.\n");
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 3 failed")
     }
 
@@ -9789,7 +9777,6 @@ H5C2_validate_lru_list(H5C2_t * cache_ptr)
          )
        ) {
 
-        HDfprintf(stdout,"H5C2_validate_lru_list: Check 4 failed.\n");
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 4 failed")
     }
 
@@ -9801,7 +9788,6 @@ H5C2_validate_lru_list(H5C2_t * cache_ptr)
              ( ( entry_ptr->prev == NULL ) ||
                ( entry_ptr->prev->next != entry_ptr ) ) ) {
 
-            HDfprintf(stdout,"H5C2_validate_lru_list: Check 5 failed.\n");
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 5 failed")
         }
 
@@ -9809,7 +9795,6 @@ H5C2_validate_lru_list(H5C2_t * cache_ptr)
              ( ( entry_ptr->next == NULL ) ||
                ( entry_ptr->next->prev != entry_ptr ) ) ) {
 
-            HDfprintf(stdout,"H5C2_validate_lru_list: Check 6 failed.\n");
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 6 failed")
         }
 
@@ -9821,7 +9806,6 @@ H5C2_validate_lru_list(H5C2_t * cache_ptr)
     if ( ( cache_ptr->LRU_list_len != len ) ||
          ( cache_ptr->LRU_list_size != size ) ) {
 
-        HDfprintf(stdout,"H5C2_validate_lru_list: Check 7 failed.\n");
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Check 7 failed")
     }
 
@@ -9886,9 +9870,6 @@ H5C2_verify_not_in_index(H5C2_t * cache_ptr,
         {
             if ( scan_ptr == entry_ptr ) {
 
-                HDfprintf(stdout,
-                          "H5C2_verify_not_in_index: entry in index (%d/%d)\n",
-                          i, depth);
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "Entry already in index.")
             }
diff --git a/src/H5C2journal.c b/src/H5C2journal.c
index 339eb00..e5c338d 100644
--- a/src/H5C2journal.c
+++ b/src/H5C2journal.c
@@ -71,6 +71,8 @@ static herr_t H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr);
 
 static herr_t H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr);
 
+static herr_t H5C2_get_journaling_in_progress(const H5F_t * f,
+					      H5C2_t * cache_ptr);
 
 
 /**************************************************************************/
@@ -146,8 +148,6 @@ H5C2_begin_journaling(H5F_t * f,
 
     if ( cache_ptr->mdj_enabled ) {
 
-	HDfprintf(stdout, "%s: metadata journaling already enabled on entry.\n",
-		  FUNC);
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
                     "metadata journaling already enabled on entry.")
     }
@@ -286,7 +286,6 @@ H5C2_begin_transaction(H5C2_t * cache_ptr,
 
         if ( cache_ptr->trans_in_progress ) {
 
-	    HDfprintf(stdout, "%s transaction already in progress.\n", FUNC);
 	    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                         "transaction already in progress?.")
         }
@@ -1238,7 +1237,7 @@ H5C2_check_for_journaling(H5F_t * f,
 
     if ( H5C2__check_for_journaling ) {
 
-        result = H5C2_get_journaling_in_progress(f, dxpl_id, cache_ptr);
+        result = H5C2_get_journaling_in_progress(f, cache_ptr);
 
         if ( result != SUCCEED ) {
 
@@ -1341,12 +1340,11 @@ done:
 
 herr_t
 H5C2_get_journaling_in_progress(const H5F_t * f,
-                                hid_t dxpl_id,
 				H5C2_t * cache_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_get_journaling_in_progress, FAIL)
+    FUNC_ENTER_NOAPI_NOINIT(H5C2_get_journaling_in_progress)
 
 #if 0 /* JRM */
     HDfprintf(stdout, "%s: entering.\n", FUNC);
@@ -1386,7 +1384,7 @@ H5C2_get_journaling_in_progress(const H5F_t * f,
 
         if ( ( (cache_ptr->jnl_file_name)[cache_ptr->jnl_file_name_len]
                != '\0' ) ||
-             ( strlen(cache_ptr->jnl_file_name) != 
+             ( HDstrlen(cache_ptr->jnl_file_name) != 
                (size_t)(cache_ptr->jnl_file_name_len) ) ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
@@ -1447,7 +1445,6 @@ H5C2_mark_journaling_in_progress(H5F_t * f,
                                  const char * journal_file_name_ptr)
 {
     H5C2_t * cache_ptr;
-    herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(H5C2_mark_journaling_in_progress, FAIL)
@@ -1475,7 +1472,7 @@ H5C2_mark_journaling_in_progress(H5F_t * f,
     }
 
     cache_ptr->jnl_magic = journal_magic;
-    cache_ptr->jnl_file_name_len = strlen(journal_file_name_ptr);
+    cache_ptr->jnl_file_name_len = HDstrlen(journal_file_name_ptr);
 
     if ( cache_ptr->jnl_file_name_len <= 0 ) {
 
@@ -1585,7 +1582,6 @@ H5C2_unmark_journaling_in_progress(H5F_t * f,
 				   H5C2_t UNUSED * cache_ptr)
 #endif /* NDEBUG */
 {
-    herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(H5C2_unmark_journaling_in_progress, FAIL)
@@ -1779,7 +1775,6 @@ herr_t
 H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
 			       int32_t idx)
 {
-    herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
     int32_t i;
     double fraction_in_use;
@@ -1930,6 +1925,7 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
          ( cache_ptr->mdjsc_cb_tbl_len > H5C2__MIN_MDJSC_CB_TBL_LEN ) &&
          ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < 
 	   (cache_ptr->mdjsc_cb_tbl_len / 2) ) ) {
+        herr_t result;
 
         result = H5C2_shrink_mdjsc_callback_table(cache_ptr);
 
@@ -2441,41 +2437,24 @@ H5C2_jb__comment(H5C2_jbrb_t * struct_ptr,
     } /* end if */
 
     temp_len = HDstrlen(comment_ptr) + 11;
-    if ( ( temp = H5MM_malloc(HDstrlen(comment_ptr) + 11) ) == NULL ) {
-
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
-                   "allocation of temp buffer failed.");
-    } /* end if */
+    if(NULL == (temp = H5MM_malloc(temp_len + 1)))
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "allocation of temp buffer failed.")
 
     /* Write comment message */
-    HDsnprintf(temp, temp_len, "C comment %s", comment_ptr);
+    HDsnprintf(temp, (temp_len + 1), "C comment %s\n", comment_ptr);
+    HDassert(temp_len == HDstrlen(temp));
 
-    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, FALSE, struct_ptr->cur_trans ) < 0 ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
-    } /* end if */
-
-    if ( H5C2_jb__write_to_buffer(struct_ptr, 1, "\n", FALSE, struct_ptr->cur_trans ) < 0 ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
-    } /* end if */
+    if(H5C2_jb__write_to_buffer(struct_ptr, temp_len, temp, FALSE, struct_ptr->cur_trans) < 0)
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "H5C2_jb__write_to_buffer() failed.\n")
 
 done:
-
-    if ( temp != NULL ) {
-
+    if(NULL != temp) {
         temp = H5MM_xfree(temp);
-        if ( temp != NULL ) {
-
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
-                        "free of assembly buffer failed.");
-        }
-    }
+        if(NULL != temp)
+            HDONE_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "free of assembly buffer failed.")
+    } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-
 } /* end H5C2_jb__comment */
 
 
@@ -2572,8 +2551,8 @@ herr_t
 H5C2_jb__eoa(H5C2_jbrb_t * struct_ptr,
 		 haddr_t eoa)
 {
-    char temp[40];
-    size_t temp_len = 40;
+    char temp[41];
+    size_t temp_len = 41;
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(H5C2_jb__eoa, FAIL)
@@ -2586,35 +2565,20 @@ H5C2_jb__eoa(H5C2_jbrb_t * struct_ptr,
     /* Verify that header message is present in journal file or ring buffer. 
      * If not, write it. 
      */
-    if ( struct_ptr->header_present == FALSE ) {
-
-        if ( H5C2_jb__write_header_entry(struct_ptr) != SUCCEED ) {
-
-            HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_header_entry() failed.\n")
-        }
+    if(struct_ptr->header_present == FALSE ) {
+        if(H5C2_jb__write_header_entry(struct_ptr) != SUCCEED)
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "H5C2_jb__write_header_entry() failed.\n")
     } /* end if */
 
     /* Write EOA message */
-    HDsnprintf(temp, temp_len, "E eoa_value 0x%llx", eoa);
+    HDsnprintf(temp, temp_len, "E eoa_value 0x%llx\n", eoa);
+    HDassert(HDstrlen(temp) < temp_len);
 
-    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, FALSE, struct_ptr->cur_trans ) < 0 ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
-    } /* end if */
-
-    if ( H5C2_jb__write_to_buffer(struct_ptr, 1, "\n", FALSE, 
-                                  struct_ptr->cur_trans ) < 0 ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
-    } /* end if */
+    if(H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, FALSE, struct_ptr->cur_trans) < 0)
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "H5C2_jb__write_to_buffer() failed.\n")
 
 done:
-
     FUNC_LEAVE_NOAPI(ret_value)
-
 } /* end H5C2_jb__eoa */
 
 
@@ -2637,15 +2601,12 @@ done:
 herr_t 
 H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
 {
-    hbool_t verbose = FALSE;
     int result;
     int i;
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(H5C2_jb__flush, FAIL)
 
-    if ( verbose ) { HDfprintf(stdout, "%s: entering.\n", FUNC); }
-
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
@@ -2654,7 +2615,6 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
 
     if (struct_ptr->trans_in_prog != FALSE) {
 
-        if ( verbose ) { HDfprintf(stdout, "%s: trans in progress.\n", FUNC); }
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                     "Attempt to flush buffers with transaction in progress.")
     } /* end if */
@@ -2668,7 +2628,6 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
 
 	if ( result == -1 ) {
 
-            if ( verbose ) { HDfprintf(stdout, "%s: write failed 1.\n", FUNC); }
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \
 		        "Journal file write failed(1).")
         }
@@ -2688,7 +2647,6 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
 
 	if ( result == -1 ) {
 
-            if ( verbose ) { HDfprintf(stdout, "%s: write failed 2.\n", FUNC); }
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \
 		        "Journal file write failed (2).")
         }
@@ -2708,7 +2666,6 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
 
 	if ( result == -1 ) {
 
-            if ( verbose ) { HDfprintf(stdout, "%s: write failed 3.\n", FUNC); }
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \
 		        "Journal file write failed (3).")
         }
@@ -2724,17 +2681,11 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
     /* perform sync to ensure everything gets to disk before returning */
     /* Note: there is no HDfsync function, so for now, the standard
        fsync is being used. */
-    if ( fsync(struct_ptr->journal_file_fd) != 0 ) {
-
-        if ( verbose ) { 
-	    HDfprintf(stdout, "%s: fsync() failed. errno = %d (%s)\n", 
-		      FUNC, errno, strerror(errno)); 
-        }
+    if(fsync(struct_ptr->journal_file_fd) < 0)
         HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, "Journal file sync failed.")
-    } /* end if */
 
     /* record last transaction number that made it to disk */
-	struct_ptr->last_trans_on_disk = 
+    struct_ptr->last_trans_on_disk = 
 		(*struct_ptr->trans_tracking)[struct_ptr->put];
 
     /* MIKE: optimization note: don't reset to top of ring buffer. 
@@ -2748,20 +2699,14 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
 
     /* Propogate the last transaction on in the buffers throughout the 
      * transaction tracking array. */
-    for (i=0; i<struct_ptr->num_bufs; i++)
-    {
+    for(i = 0; i < struct_ptr->num_bufs; i++)
 	(*struct_ptr->trans_tracking)[i] = struct_ptr->last_trans_on_disk;
-    }
 
     /* update get index */
     struct_ptr->get = struct_ptr->put;
 
 done:
-
-    if ( verbose ) { HDfprintf(stdout, "%s: exiting.\n", FUNC); }
-
     FUNC_LEAVE_NOAPI(ret_value)
-
 } /* end H5C2_jb__flush */
 
 
@@ -2784,14 +2729,11 @@ done:
 herr_t 
 H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)	
 {
-    hbool_t verbose = FALSE;
     int result;
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(H5C2_jb__flush_full_buffers, FAIL)
 
-    if ( verbose ) { HDfprintf(stdout, "%s: entering.\n", FUNC); }
-	
     /* this asserts that at least one buffer is in use */
     HDassert(struct_ptr->bufs_in_use > 0);
     /* write an assert to verify that at least one buffer is full */
@@ -2811,7 +2753,6 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)
 
 	if ( result == -1 ) {
 
-            if ( verbose ) { HDfprintf(stdout, "%s: write failed 1.\n", FUNC); }
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \
 		        "Journal file write failed (1).")
         }
@@ -2830,7 +2771,6 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)
 
 	if ( result == -1 ) {
 
-            if ( verbose ) { HDfprintf(stdout, "%s: write failed 2.\n", FUNC); }
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \
 		        "Journal file write failed (2).")
         }
@@ -2852,9 +2792,6 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)
 
 	    if ( result == -1 ) {
 
-                if ( verbose ) { 
-		    HDfprintf(stdout, "%s: write failed 3.\n", FUNC); 
-		}
                 HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \
 		            "Journal file write failed(3).")
             } /* end if */
@@ -2886,8 +2823,6 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)
 
 done:
 
-    if ( verbose ) { HDfprintf(stdout, "%s: exiting.\n", FUNC); }
-
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* end H5C2_jb__flush_full_buffers */
@@ -2918,17 +2853,9 @@ H5C2_jb__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
     FUNC_ENTER_NOAPI(H5C2_jb__get_last_transaction_on_disk, FAIL)
 	
     /* Check Arguments */
+    HDassert( struct_ptr != NULL );
     HDassert( trans_num_ptr != NULL );
-
-    /* This should really be an assert, but the func enter/exit 
-     * macros get testy if there isn't at least one goto error 
-     * macro call in the funtion.
-     */
-    if ( ( struct_ptr == NULL ) ||
-         ( struct_ptr->magic != H5C2__H5C2_JBRB_T_MAGIC ) ) {
-
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "bad struct_ptr.")
-    }
+    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
 
     /* JRM: In machine readable version, lets check to see if a sync is 
      *      necessary, and call it only if it is.
@@ -2936,18 +2863,13 @@ H5C2_jb__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
     /* perform a sync to ensure everything gets to disk before continuing */
     /* Note: there is no HDfsync function, so for now, the standard
        fsync is being used. */
-    if ( fsync(struct_ptr->journal_file_fd) < 0 ) {
-
+    if(fsync(struct_ptr->journal_file_fd) < 0 )
         HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, "Jounal file sync failed.")
 
-    } /* end if */
-
     * trans_num_ptr = struct_ptr->last_trans_on_disk;
 
 done:
-
     FUNC_LEAVE_NOAPI(ret_value)
-
 } /* end H5C2_jb__get_last_transaction_on_disk */
 
 
@@ -2986,10 +2908,8 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
 	      hbool_t use_aio,		
  	      hbool_t human_readable)
 {
-    char 	temp[150];
     int 	i;
     herr_t 	ret_value = SUCCEED;
-    time_t      current_date;
 
     FUNC_ENTER_NOAPI(H5C2_jb__init, FAIL)
 
@@ -3050,9 +2970,6 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
 
     if ( struct_ptr->journal_file_fd  == -1) {
 
-	HDfprintf(stdout, 
-	      "%s: Can't create journal file \"%s\".  Does it already exist?\n", 
-	      FUNC, journal_file_name);
         HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, \
                     "Can't create journal file.  Does it already exist?")
     } /* end if */
@@ -3063,9 +2980,6 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
 
     if ( struct_ptr->buf == NULL ) {
 
-	HDfprintf(stdout, 
-	          "%s: allocation of buf pointer array failed.\n", 
-		  FUNC);
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                     "allocation of buf pointer array failed.");
     } /* end if */
@@ -3076,9 +2990,6 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
 
     if ( (*struct_ptr->buf)[0] == NULL ) {
 
-	HDfprintf(stdout, 
-	          "%s: allocation of buffers failed.\n", 
-		  FUNC);
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                     "allocation of buffers failed.");
     } /* end if */
@@ -3091,9 +3002,6 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
 
     if ( struct_ptr->trans_tracking == NULL ) {
 
-	HDfprintf(stdout, 
-	          "%s: allocation of trans_tracking failed.\n", 
-		  FUNC);
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                     "allocation of trans_tracking failed.");
     } /* end if */
@@ -3229,39 +3137,25 @@ H5C2_jb__journal_entry(H5C2_jbrb_t * struct_ptr,
     }
 
 done:
-
-    if ( bodydata != NULL )
-    {
+    if(bodydata != NULL) {
         bodydata = H5MM_xfree(bodydata);
-        if ( bodydata != NULL ) {
-
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
-                        "free of assembly buffer failed.");
-        }
-    }
+        if(bodydata != NULL)
+            HDONE_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "free of assembly buffer failed.")
+    } /* end if */
 
-    if ( temp != NULL )
-    {
+    if(temp != NULL) {
         temp = H5MM_xfree(temp);
-        if ( temp != NULL ) {
-
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
-                        "free of assembly buffer failed.");
-        }
-    }
+        if(temp != NULL)
+            HDONE_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "free of assembly buffer failed.")
+    } /* end if */
 
-    if ( hexdata != NULL )
-    {
+    if(hexdata != NULL) {
         hexdata = H5MM_xfree(hexdata);
-        if ( hexdata != NULL ) {
-
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
-                        "free of assembly buffer failed.");
-        }
-    }
+        if(hexdata != NULL)
+            HDONE_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "free of assembly buffer failed.")
+    } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-
 } /* end H5C2_jb__journal_entry */
 
 
@@ -3290,7 +3184,6 @@ H5C2_jb__start_transaction(H5C2_jbrb_t * struct_ptr,
 {
     char temp[150];
     herr_t ret_value = SUCCEED;
-    time_t current_date;
 
     FUNC_ENTER_NOAPI(H5C2_jb__start_transaction, FAIL)
 #if 0 /* JRM */
@@ -3375,15 +3268,9 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
 
 {
     herr_t ret_value = SUCCEED;
-    hbool_t verbose = FALSE;
 	
     FUNC_ENTER_NOAPI(H5C2_jb__takedown, FAIL)
 
-    if ( verbose ) {
-
-        HDfprintf(stdout, "%s: entering.\n", FUNC);
-    }
-
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
@@ -3391,10 +3278,6 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
     /* Verify that the journal buffers are empty */
     if ( struct_ptr->bufs_in_use != 0 ) {
 
-	if ( verbose ) {
-	    HDfprintf(stdout, "%s: Attempt to takedown with non-empty buffers.\n",
-		      FUNC);
-	}
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 	            "Attempt to takedown with non-empty buffers.")
     } /* end if */	
@@ -3402,11 +3285,6 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
     /* Verify that the journal file has been truncated */
     if (struct_ptr->journal_is_empty != TRUE) {
 
-	if ( verbose ) {
-	    HDfprintf(stdout, 
-		     "%s: Attempt to takedown with journal file not truncated.\n",
-		     FUNC);
-	}
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 	            "Attempt to takedown with journal file not truncated.")
     } /* end if */
@@ -3414,21 +3292,11 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
     /* Close and delete the journal file associated with struct_ptr */
     if ( HDclose(struct_ptr->journal_file_fd) < 0 ) {
 
-	if ( verbose ) {
-	    HDfprintf(stdout, 
-		     "%s: journal file close failed. errno = %d(%s), fd = %d.\n",
-		     FUNC, errno, strerror(errno), struct_ptr->journal_file_fd);
-	}
         HGOTO_ERROR(H5E_IO, H5E_CLOSEERROR, FAIL, "Jounal file close failed.")
     } /* end if */
 
     if ( HDremove(struct_ptr->jname) < 0) {
 
-	if ( verbose ) {
-	    HDfprintf(stdout, 
-		      "%s: journal file remove failed. errno = %d(%s).\n",
-		      FUNC, errno, strerror(errno));
-	}
         HGOTO_ERROR(H5E_IO, H5E_REMOVEFAIL, FAIL, "Jounal file close failed.")
     } /* end if */
 
@@ -3440,12 +3308,6 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
 
         if ( struct_ptr->jname != NULL ) {
 
-	    if ( verbose ) {
-
-	        HDfprintf(stdout, "%s: free of jname failed.\n", FUNC);
-
-	    }
-
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
                         "free of jname failed.");
         }
@@ -3457,12 +3319,6 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
 
         if ( struct_ptr->hdf5_file_name != NULL ) {
 
-	    if ( verbose ) {
-
-	        HDfprintf(stdout, "%s: free of hdf5_file_name failed.\n", FUNC);
-
-	    }
-
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
                         "free of hdf5_file_name failed.");
         }
@@ -3473,9 +3329,6 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
         (*struct_ptr->buf)[0] = H5MM_xfree((*struct_ptr->buf)[0]);
         if ( (*struct_ptr->buf)[0] != NULL ) {
 
-	    if ( verbose ) {
-	        HDfprintf(stdout, "%s: free of buffers failed.\n", FUNC);
-	    }
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
                         "free of buffers failed.");
         }
@@ -3486,10 +3339,6 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
         struct_ptr->buf = H5MM_xfree(struct_ptr->buf);
         if ( struct_ptr->buf != NULL ) {
 
-	    if ( verbose ) {
-	        HDfprintf(stdout, "%s: free of buffer ptr array faileid.\n", 
-			  FUNC);
-	    }
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
                         "free of buffer pointer array failed.");
         }
@@ -3501,12 +3350,6 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
 
         if ( struct_ptr->trans_tracking != NULL ) {
 
-	    if ( verbose ) {
-	        HDfprintf(stdout, 
-                          "%s: free of trans tracking array faileid.\n", 
-			  FUNC);
-	    }
-
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
                         "free of transaction tracking array failed.");
         }
@@ -3514,12 +3357,6 @@ H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
 
 done:
 
-    if ( verbose ) {
-
-        HDfprintf(stdout, "%s: exiting.\n", FUNC);
-        fflush(stdout);
-    }
-
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* end H5C2_jb__takedown */
@@ -3632,7 +3469,6 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
 
 {
     herr_t      ret_value = SUCCEED;
-    hbool_t	verbose = FALSE;
     char 	*buf;
     char      * p;
     char	time_buf[32];
@@ -3651,7 +3487,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
     HDassert( struct_ptr->header_present == FALSE );
     HDassert( struct_ptr->journal_is_empty == TRUE );
 
-    file_name_len = strlen(struct_ptr->hdf5_file_name);
+    file_name_len = HDstrlen(struct_ptr->hdf5_file_name);
 
     HDassert( file_name_len > 0 );
 
@@ -3662,17 +3498,12 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
 
     if ( buf == NULL ) {
 
-        if ( verbose ) {
-
-	    HDfprintf(stdout, "%s: buffer allocation failed.\n", FUNC);
-        }
-
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                     "buffer allocation failed.");
     } /* end if */
 	
     /* Get the current date */
-    current_date = time(NULL);
+    current_date = HDtime(NULL);
 
     /* load ascii representation of current_date into time_buf[],
      * replacing white space with underscores.
@@ -3730,28 +3561,16 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
 
     if ( chars_written >= buf_len - 1 ) {
 
-        if ( verbose ) {
-
-	    HDfprintf(stdout, "%s: tried to overwrite buffer.\n", FUNC);
-        }
-
 	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTCOPY, FAIL, \
                     "tried to overwrite buffer.");
     }
 
-    HDassert( strlen(buf) < buf_len );
+    HDassert( HDstrlen(buf) < buf_len );
 
     /* Write the header message into the ring buffer */
     if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(buf), buf, FALSE, 
 			          (uint64_t)0) < 0) {
 
-        if ( verbose ) {
-
-	    HDfprintf(stdout, 
-	              "%s: H5C2_jb__write_to_buffer() failed.\n", 
-		      FUNC);
-        }
-
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
                     "H5C2_jb__write_to_buffer() failed.\n")
     } /* end if */
@@ -3761,21 +3580,13 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
     struct_ptr->journal_is_empty = FALSE;
 
 done:
-
-    if ( buf != NULL ) {
-
+    if(buf != NULL) {
         buf = H5MM_xfree(buf);
-
-        if ( buf != NULL ) {
-
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, \
-                        "free of buf failed.");
-        }
-    }
-
+        if(buf != NULL)
+            HDONE_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "free of buf failed.")
+    } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-
 } /* end H5C2_jb__write_header_entry() */
 
 
@@ -4015,8 +3826,8 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 		struct_ptr->put += 1;
 
                 /* Drag trans_tracking value into next buffer */
-                (*struct_ptr->trans_tracking)[struct_ptr->put] 
-                 = (*struct_ptr->trans_tracking)[struct_ptr->put - 1];
+                (*struct_ptr->trans_tracking)[struct_ptr->put] =
+                        (*struct_ptr->trans_tracking)[struct_ptr->put - 1];
 
 	    } /* end if */
                 
diff --git a/src/H5C2private.h b/src/H5C2private.h
index c9e55ca..744f6e9 100644
--- a/src/H5C2private.h
+++ b/src/H5C2private.h
@@ -1652,10 +1652,6 @@ H5_DLL herr_t H5C2_check_for_journaling(H5F_t * f,
 		                        H5C2_t * cache_ptr,
                                         hbool_t journal_recovered);
 
-H5_DLL herr_t H5C2_get_journaling_in_progress(const H5F_t * f,
-                                              hid_t dxpl_id,
-					      H5C2_t * cache_ptr);
-
 H5_DLL herr_t H5C2_mark_journaling_in_progress(H5F_t * f,
                                             hid_t dxpl_id,
 					    const int32_t journal_magic,
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 1318eb8..3258ca7 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -143,9 +143,6 @@ typedef struct H5F_file_t {
     size_t  mdc_jnl_file_name_len; /* journal file name length          */
     char    mdc_jnl_file_name[H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1];
                                 /* journal file name -- if defined      */
-/* todo -- delete the following lines.  -- JRM */
-    haddr_t mdc_jrnl_block_loc; /* Rel addr of mdc journal block	*/
-    hsize_t mdc_jrnl_block_len; /* Length of mdc journal block		*/
 } H5F_file_t;
 
 /*
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 2e1f564..093f5b4 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -1199,8 +1199,8 @@ done:
  *
  *              If journaling is enabled, create a superblock extension
  *              if necessary and then write the current contents of 
- *              the mdc_jnl_enabled, mdc_jrnl_block_loc, and 
- *              mdc_jrnl_block_len fields of the shared structure to the 
+ *              the mdc_jnl_enabled, mdc_jnl_magic, mdc_jnl_file_name_lenand 
+ *              mdc_jnl_file_name fields of the shared structure to the 
  *              mdj_msg in the superblock extention, overwriting the old 
  *              message if it exists.
  *
diff --git a/src/H5Omdj_msg.c b/src/H5Omdj_msg.c
index 6ba1774..e63aafe 100644
--- a/src/H5Omdj_msg.c
+++ b/src/H5Omdj_msg.c
@@ -174,7 +174,7 @@ H5O_mdj_msg_decode(H5F_t *f,
 
 
     /* get the journal file path length */
-    INT32DECODE(p, path_len);
+    UINT32DECODE(p, path_len);
 
     if ( path_len > H5C2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
@@ -236,7 +236,7 @@ H5O_mdj_msg_encode(H5F_t *f,
     const H5O_mdj_msg_t *mesg = (const H5O_mdj_msg_t *)_mesg;
     uint16_t flags = 0;
     int32_t magic;
-    int32_t path_len;
+    uint32_t path_len;
     herr_t ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT(H5O_mdj_msg_encode)
@@ -266,7 +266,7 @@ H5O_mdj_msg_encode(H5F_t *f,
 
     magic = mesg->mdc_jnl_magic;
 
-    path_len = (int32_t)(mesg->mdc_jnl_file_name_len);
+    path_len = (uint32_t)(mesg->mdc_jnl_file_name_len);
 
     /* Store version, flags, magic, path_len, & path */
 
@@ -276,7 +276,7 @@ H5O_mdj_msg_encode(H5F_t *f,
 
     INT32ENCODE(p, magic);
 
-    INT32ENCODE(p, path_len);
+    UINT32ENCODE(p, path_len);
 
     HDmemcpy(p, mesg->mdc_jnl_file_name, path_len + 1);
     p += path_len + 1;
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index 9bfe756..3c29c24 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -2012,22 +2012,15 @@ H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx,
     HDassert(mesg);
 
     /* Protect chunk */
-    if ( NULL == 
-         (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, idx_msg->chunkno)) ) {
-
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, \
-                    "unable to load object header chunk")
-    }
+    if(NULL == (chk_proxy = H5O_chunk_protect(f, dxpl_id, oh, idx_msg->chunkno)))
+	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
     /* Reset existing native information for the header's message */
     H5O_msg_reset_real(type, idx_msg->native);
 
     /* Copy the native object for the message */
-    if ( NULL == (idx_msg->native = (type->copy)(mesg, idx_msg->native)) ) {
-
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, \
-                    "unable to copy message to object header")
-    }
+    if(NULL == (idx_msg->native = (type->copy)(mesg, idx_msg->native)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to copy message to object header")
 
     /* Update the message flags */
     idx_msg->flags = mesg_flags;
diff --git a/tools/h5recover/h5recover.c b/tools/h5recover/h5recover.c
index dda2d67..f8ca64a 100644
--- a/tools/h5recover/h5recover.c
+++ b/tools/h5recover/h5recover.c
@@ -1919,9 +1919,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
                     break;
 
                 default:
-                    /* Unknown message -- scream and die. */
-                    success = FALSE;
-
+                    /* Unknown message -- scream, but don't die. */
                     HDfprintf(err_file_ptr, "%sSB ext chunk %d %s\n",
                               indent1, chunk_num,
                               "appears to contain an unknown mssg.");
@@ -2049,7 +2047,7 @@ get_mdj_msg_data(int fd,
     uint8_t * p;
     uint16_t flags;
     int32_t magic;
-    int32_t path_len;
+    uint32_t path_len;
     int version;
     off_t offset;
     FILE * err_file_ptr = stderr;
@@ -2119,7 +2117,7 @@ get_mdj_msg_data(int fd,
         p = &(buf[1]);
         UINT16DECODE(p, flags);
         INT32DECODE(p, magic);
-        INT32DECODE(p, path_len);
+        UINT32DECODE(p, path_len);
 
         if ( (flags & MDJ_MSG__JOURNALING_ENABLED_FLAG) == 0 ) {
 
diff --git a/tools/h5recover/testh5recover.sh.in b/tools/h5recover/testh5recover.sh.in
index 8c6c22e..f2ca102 100644
--- a/tools/h5recover/testh5recover.sh.in
+++ b/tools/h5recover/testh5recover.sh.in
@@ -201,8 +201,8 @@ run_h5recover_output_test() {
 
     TESTING $COMMENT
 
-    cp ./testfiles/${BASE_NAME}.h5 .
-    cp ./testfiles/${BASE_NAME}.jnl .
+    cp $srcdir/testfiles/${BASE_NAME}.h5 .
+    cp $srcdir/testfiles/${BASE_NAME}.jnl .
 
     ( $RUNSERIAL ./h5recover -j ${BASE_NAME}.jnl -n ${FLAGS} ${BASE_NAME}.h5 \
                  > ${BASE_NAME}.stdout ) 2> ${BASE_NAME}.stderr