diff --git a/lib/progbar.c b/lib/progbar.c index fde2e70..9ecc803 100644 --- a/lib/progbar.c +++ b/lib/progbar.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "progbar.h" @@ -37,6 +38,8 @@ int progbar_update(struct progbar * ctx, const char *label, int curr, int max, struct timeval tv; int dpywidth; int fixed_percent; + assert (curr >= 0); + assert (max > 0); float percent = ((float) curr) / ((float) max) * 100; if (ctx->flags & E2F_FLAG_PROG_SUPPRESS) diff --git a/reiserfscore/journal.c b/reiserfscore/journal.c index a3ebcde..00e1939 100644 --- a/reiserfscore/journal.c +++ b/reiserfscore/journal.c @@ -818,13 +818,12 @@ int replay_journal (reiserfs_filsys_t * fs) control.trans_id = get_jh_last_flushed (j_head); control.desc_blocknr = get_jh_replay_start_offset (j_head); - if (!get_boundary_transactions (fs, &cur, &newest)) { + trans_count = get_boundary_transactions (fs, &cur, &newest); + if (!trans_count) { reiserfs_warning (stderr, "No transactions found\n"); return 0; } - trans_count = newest.trans_id - cur.trans_id; - /* Smth strange with journal header or journal. We cannot say for sure what was the last replaied transaction, but relying on JH data is preferable. */