Author: kpvdr Date: 2010-09-29 10:25:14 -0400 (Wed, 29 Sep 2010) New Revision: 4359 Modified: store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp Log: Fixed careless checkin r.4430 which broke ptolemy, some reformatting of lines > 120 chars Modified: store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2010-09-29 10:42:30 UTC (rev 4358) +++ store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2010-09-29 14:25:14 UTC (rev 4359) @@ -213,7 +213,7 @@ * * current lfid == bad_lfid AND bad_lfid > oldest (ie we are past the oldest and preparing the * bad lfid) */ - if (owi_invert_flag = full && oldest_lfid > 0 && + if (full && oldest_lfid > 0 && (lfid == oldest_lfid || (bad_lfid > oldest_lfid && lfid == bad_lfid))) owi = !owi; const u_int64_t frid = u_int64_t(random()); @@ -461,7 +461,8 @@ { stringstream fn; fn << test_dir << "/" << base_filename << "." << JRNL_INFO_EXTENSION; - BOOST_WARN_MESSAGE(::unlink(fn.str().c_str()) == 0, "clean_journal_info_file(): Failed to remove file " << fn.str()); + BOOST_WARN_MESSAGE(::unlink(fn.str().c_str()) == 0, "clean_journal_info_file(): Failed to remove file " << + fn.str()); } static string create_journal_filename(const u_int16_t pfid, const string base_filename) @@ -535,7 +536,10 @@ BOOST_FAIL("Error closing test journal file \"" << filename << "\"."); } - static void write_file_header(const std::string& filename, ofstream& of, const file_hdr& fh, const char fill_char) + static void write_file_header(const std::string& filename, + ofstream& of, + const file_hdr& fh, + const char fill_char) { // write file header u_int32_t cnt = sizeof(file_hdr); @@ -602,7 +606,11 @@ } u_int64_t -enq_msg(jcntl& jc, const u_int64_t rid, const string& msg, const bool transient, const iores exp_ret = RHM_IORES_SUCCESS) +enq_msg(jcntl& jc, + const u_int64_t rid, + const string& msg, + const bool transient, + const iores exp_ret = RHM_IORES_SUCCESS) { ostringstream ctxt; ctxt << "enq_msg(" << rid << ")";