From f7d3febcd600d67f81bfe299498b8a13741d2bd0 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 9 Jul 2012 17:00:45 +1000 Subject: [PATCH] Use explicit non-char opt for --zero-super As we don't allow '-K' for '--zero-super' there is no point using it internally. Just define a 'KillOpt' like with other options. Signed-off-by: NeilBrown --- ReadMe.c | 2 +- mdadm.c | 6 +++--- mdadm.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ReadMe.c b/ReadMe.c index 1efc4470..fa71ec94 100644 --- a/ReadMe.c +++ b/ReadMe.c @@ -86,7 +86,7 @@ struct option long_options[] = { {"follow", 0, 0, 'F'}, {"grow", 0, 0, 'G'}, {"incremental",0,0, 'I'}, - {"zero-superblock", 0, 0, 'K'}, /* deliberately not a short_option */ + {"zero-superblock", 0, 0, KillOpt}, /* deliberately not a short_option */ {"query", 0, 0, 'Q'}, {"examine-bitmap", 0, 0, 'X'}, {"auto-detect", 0, 0, AutoDetect}, diff --git a/mdadm.c b/mdadm.c index 846bc964..31b7cfaa 100644 --- a/mdadm.c +++ b/mdadm.c @@ -252,7 +252,7 @@ int main(int argc, char *argv[]) case KillSubarray: case UpdateSubarray: case UdevRules: - case 'K': + case KillOpt: if (!mode) newmode = MISC; break; @@ -932,7 +932,7 @@ int main(int argc, char *argv[]) case O(MISC,'Q'): case O(MISC,'D'): case O(MISC,'E'): - case O(MISC,'K'): + case O(MISC,KillOpt): case O(MISC,'R'): case O(MISC,'S'): case O(MISC,'X'): @@ -1562,7 +1562,7 @@ int main(int argc, char *argv[]) brief?1+verbose:0, export, test, homehost, prefer); continue; - case 'K': /* Zero superblock */ + case KillOpt: /* Zero superblock */ if (ss) rv |= Kill(dv->devname, ss, force, quiet,0); else { diff --git a/mdadm.h b/mdadm.h index 4cf34ab1..bda557db 100644 --- a/mdadm.h +++ b/mdadm.h @@ -323,6 +323,7 @@ enum special_options { Continue, OffRootOpt, Prefer, + KillOpt, }; /* structures read from config file */ -- 2.39.2