diff options
Diffstat (limited to 'mdadm.c')
| -rw-r--r-- | mdadm.c | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -26,7 +26,7 @@ * Sydney, 2052 * Australia * - * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004, + * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004, * Paul Clements, SteelEye Technology, Inc. */ @@ -133,7 +133,7 @@ int main(int argc, char *argv[]) /* firstly, some mode-independant options */ switch(opt) { case 'h': - if (option_index > 0 && + if (option_index > 0 && strcmp(long_options[option_index].name, "help-options")==0) print_help = 2; else @@ -174,7 +174,7 @@ int main(int argc, char *argv[]) } /* second, figure out the mode. * Some options force the mode. Others - * set the mode if it isn't already + * set the mode if it isn't already */ switch(opt) { @@ -232,7 +232,7 @@ int main(int argc, char *argv[]) mode = newmode; } else { /* special case of -c --help */ - if (opt == 'c' && + if (opt == 'c' && ( strncmp(optarg, "--h", 3)==0 || strncmp(optarg, "-h", 2)==0)) { fputs(Help_config, stdout); @@ -255,7 +255,7 @@ int main(int argc, char *argv[]) dv->next = NULL; *devlistend = dv; devlistend = &dv->next; - + devs_found++; continue; } @@ -307,7 +307,7 @@ int main(int argc, char *argv[]) dv->next = NULL; *devlistend = dv; devlistend = &dv->next; - + devs_found++; continue; } @@ -342,7 +342,7 @@ int main(int argc, char *argv[]) fprintf(stderr, Name ": metadata information already given\n"); exit(2); } - for(i=0; !ss && superlist[i]; i++) + for(i=0; !ss && superlist[i]; i++) ss = superlist[i]->match_metadata_desc(optarg); if (!ss) { @@ -451,7 +451,7 @@ int main(int argc, char *argv[]) case -5: /* Faulty * modeNNN */ - + { int ln = strcspn(optarg, "0123456789"); char *m = strdup(optarg); @@ -584,7 +584,7 @@ int main(int argc, char *argv[]) exit(2); } update = optarg; - if (strcmp(update, "sparc2.2")==0) + if (strcmp(update, "sparc2.2")==0) continue; if (strcmp(update, "super-minor") == 0) continue; @@ -605,7 +605,7 @@ int main(int argc, char *argv[]) fprintf(stderr, Name ": must not set metadata type with --update=byteorder.\n"); exit(2); } - for(i=0; !ss && superlist[i]; i++) + for(i=0; !ss && superlist[i]; i++) ss = superlist[i]->match_metadata_desc("0.swap"); if (!ss) { fprintf(stderr, Name ": INTERNAL ERROR cannot find 0.swap\n"); @@ -941,7 +941,7 @@ int main(int argc, char *argv[]) exit(2); } if ((int)ident.super_minor == -2 && autof) { - fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n"); + fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n"); exit(2); } if (mode == MANAGE || mode == GROW) @@ -1010,7 +1010,7 @@ int main(int argc, char *argv[]) devlist->devname); rv |= 1; } else { - mdfd = open_mddev(devlist->devname, + mdfd = open_mddev(devlist->devname, array_ident->autof ? array_ident->autof : autof); if (mdfd < 0) rv |= 1; @@ -1042,7 +1042,7 @@ int main(int argc, char *argv[]) rv |= 1; continue; } - mdfd = open_mddev(dv->devname, + mdfd = open_mddev(dv->devname, array_ident->autof ?array_ident->autof : autof); if (mdfd < 0) { rv |= 1; @@ -1310,7 +1310,7 @@ int main(int argc, char *argv[]) case GROW: if (devs_found > 1) { - + /* must be '-a'. */ if (size >= 0 || raiddisks) { fprintf(stderr, Name ": --size, --raiddisks, and --add are exclusing in --grow mode\n"); |