From 45e54685daeeeee57764688a4f84ea4b7b9f2b26 Mon Sep 17 00:00:00 2001 From: Andrea Mazzoleni Date: Thu, 2 Feb 2012 19:26:33 +0100 Subject: [PATCH] Setting up for v1.9 Prints the new Opening parity message before the real work. --- HISTORY | 3 +++ check.c | 10 ++++++---- configure.ac | 2 +- sync.c | 4 +++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/HISTORY b/HISTORY index e4fb74c9..cf01c853 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,9 @@ SnapRAID HISTORY ================ +1.9 2012/2 +=========== + 1.8 2012/1 =========== * Added a new "dup" command to find all the duplicate files. diff --git a/check.c b/check.c index fa405d90..0f895828 100644 --- a/check.c +++ b/check.c @@ -877,10 +877,7 @@ void state_check(struct snapraid_state* state, int fix, block_off_t blockstart, struct snapraid_parity* qarity_ptr; unsigned error; - if (fix) - printf("Checking and fixing...\n"); - else - printf("Checking...\n"); + printf("Opening parity...\n"); blockmax = parity_resize(state); size = blockmax * (data_off_t)state->block_size; @@ -939,6 +936,11 @@ void state_check(struct snapraid_state* state, int fix, block_off_t blockstart, } } + if (fix) + printf("Fixing...\n"); + else + printf("Checking...\n"); + error = 0; /* skip degenerated cases of empty parity, or skipping all */ diff --git a/configure.ac b/configure.ac index 19c2485b..8e10cc21 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.65]) -AC_INIT([snapraid], [1.8], [], [], [http://snapraid.sourceforge.net]) +AC_INIT([snapraid], [1.9], [], [], [http://snapraid.sourceforge.net]) AM_INIT_AUTOMAKE([foreign no-dependencies -Wall]) AC_CONFIG_SRCDIR([snapraid.c]) AC_CONFIG_HEADER([config.h]) diff --git a/sync.c b/sync.c index 4b324286..0b21e990 100644 --- a/sync.c +++ b/sync.c @@ -300,7 +300,7 @@ int state_sync(struct snapraid_state* state, block_off_t blockstart, block_off_t struct snapraid_parity* qarity_ptr; unsigned unrecoverable_error; - printf("Syncing...\n"); + printf("Opening parity...\n"); blockmax = parity_resize(state); size = blockmax * (data_off_t)state->block_size; @@ -334,6 +334,8 @@ int state_sync(struct snapraid_state* state, block_off_t blockstart, block_off_t qarity_ptr = 0; } + printf("Syncing...\n"); + unrecoverable_error = 0; /* skip degenerated cases of empty parity, or skipping all */