rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Completes merge from master.

Browse source
This commit is contained in:
Andrea Mazzoleni 2013-09-15 21:28:15 +02:00
parent f61fcfd850
commit 828727f7dc
1 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
state.c
View file

@ -153,22 +153,9 @@ static void state_config_check(struct snapraid_state* state, const char* path)
}
}
<<<<<<< HEAD
for(l=0;l<state->level;++l) {
if (disk->device == state->parity_device[l]) {
fprintf(stderr, "Disk '%s' and %s '%s' are on the same device.\n", disk->dir, lev_name(l), state->parity_path[l]);
=======
if (disk->device == state->parity_device) {
fprintf(stderr, "Disk '%s' and parity '%s' are on the same device.\n", disk->dir, state->parity);
#ifdef _WIN32
fprintf(stderr, "Both have the serial number '%"PRIx64"'.\n", disk->device);
#endif
exit(EXIT_FAILURE);
}
if (state->qarity[0] != 0 && disk->device == state->qarity_device) {
fprintf(stderr, "Disk '%s' and q-parity '%s' are on the same device.\n", disk->dir, state->qarity);
>>>>>>> master
#ifdef _WIN32
fprintf(stderr, "Both have the serial number '%"PRIx64"'.\n", disk->device);
#endif