From 3caa251d83cf10636be88da45f869f2ab1d659a2 Mon Sep 17 00:00:00 2001 From: Andrea Mazzoleni Date: Wed, 25 Jun 2014 23:23:22 +0200 Subject: [PATCH] Adjusts some consistency messages. --- cmdline/scan.c | 6 +++--- cmdline/state.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmdline/scan.c b/cmdline/scan.c index 4cea7f54..59a9ec15 100644 --- a/cmdline/scan.c +++ b/cmdline/scan.c @@ -213,7 +213,7 @@ static void scan_file_deallocate(struct snapraid_scan* scan, struct snapraid_fil break; default: /* LCOV_EXCL_START */ - fprintf(stderr, "Internal state inconsistency in scanning for block %u state %u\n", block->parity_pos, block_state); + fprintf(stderr, "Internal inconsistency in deallocating for block %u state %u\n", block->parity_pos, block_state); exit(EXIT_FAILURE); /* LCOV_EXCL_STOP */ } @@ -613,7 +613,7 @@ static void scan_file(struct snapraid_scan* scan, int output, const char* sub, c /* here the inode has to be different, otherwise we would have found it before */ if (file->inode == st->st_ino) { /* LCOV_EXCL_START */ - fprintf(stderr, "Internal inode '%"PRIu64"' inconsistency for files '%s%s' as unexpected matching\n", file->inode, disk->dir, sub); + fprintf(stderr, "Internal inconsistency in inode '%"PRIu64"' for files '%s%s' as unexpected matching\n", file->inode, disk->dir, sub); exit(EXIT_FAILURE); /* LCOV_EXCL_STOP */ } @@ -622,7 +622,7 @@ static void scan_file(struct snapraid_scan* scan, int output, const char* sub, c /* for sure it cannot be already present */ if (file_flag_has(file, FILE_IS_PRESENT)) { /* LCOV_EXCL_START */ - fprintf(stderr, "Internal path inconsistency for file '%s%s' matching and already present\n", disk->dir, sub); + fprintf(stderr, "Internal inconsistency in path for file '%s%s' matching and already present\n", disk->dir, sub); exit(EXIT_FAILURE); /* LCOV_EXCL_STOP */ } diff --git a/cmdline/state.c b/cmdline/state.c index 00448127..0a6a31de 100644 --- a/cmdline/state.c +++ b/cmdline/state.c @@ -1415,7 +1415,7 @@ static void state_read_text(struct snapraid_state* state, const char* path, STRE if (v_pos >= blockmax) { /* LCOV_EXCL_START */ - fprintf(stderr, "Internal position inconsistency in 'inf' specification in '%s' at line %u\n", path, line); + fprintf(stderr, "Internal inconsistency in position for 'inf' specification in '%s' at line %u\n", path, line); exit(EXIT_FAILURE); /* LCOV_EXCL_STOP */ } @@ -3726,7 +3726,7 @@ static void state_write_binary(struct snapraid_state* state, STREAM* f) /* consistency check */ if (block != disk_block_get(disk, block->parity_pos)) { /* LCOV_EXCL_START */ - fprintf(stderr, "Internal inconsistency mismatch for block %u state %u in file '%s'\n", block->parity_pos, block_state, file->sub); + fprintf(stderr, "Internal inconsistency in mismatch for block %u state %u in file '%s'\n", block->parity_pos, block_state, file->sub); exit(EXIT_FAILURE); /* LCOV_EXCL_STOP */ }