From dc1b177a1a5f362be069c9017d4d79389f064495 Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Mon, 15 Jun 2015 22:12:45 +1000 Subject: [PATCH] regsvr32: Convert if-else block to switch statement. --- programs/regsvr32/regsvr32.c | 44 +++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index e048b30e461..8aa567cb805 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -52,6 +52,7 @@ #include "wine/port.h" #include +#include #include #include #include "regsvr32.h" @@ -252,26 +253,33 @@ int main(int argc, char* argv[]) */ for(i = 1; i < argc; i++) { - if ((!strcasecmp(argv[i], "/u")) ||(!strcasecmp(argv[i], "-u"))) + if ((argv[i][0] == '/' || argv[i][0] == '-') && (!argv[i][2] || argv[i][2] == ':')) + { + switch (tolower(argv[i][1])) + { + case 'u': Unregister = TRUE; - else if ((!strcasecmp(argv[i], "/s"))||(!strcasecmp(argv[i], "-s"))) + break; + case 's': Silent = TRUE; - else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i")))) - { - CallInstall = TRUE; - wsCommandLine = parse_command_line(argv[i] + strlen("/i")); - if (!wsCommandLine) - wsCommandLine = EmptyLine; - } - else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n"))) - CallRegister = FALSE; - else if((!strcasecmp(argv[i], "/c"))||(!strcasecmp(argv[i], "-c"))) - /* console output */; - else if (argv[i][0] == '/' && (!argv[i][2] || argv[i][2] == ':')) - { - output_write(STRING_UNRECOGNIZED_SWITCH, argv[i]); - output_write(STRING_USAGE); - return 1; + break; + case 'i': + CallInstall = TRUE; + wsCommandLine = parse_command_line(argv[i] + strlen("/i")); + if (!wsCommandLine) + wsCommandLine = EmptyLine; + break; + case 'n': + CallRegister = FALSE; + break; + case 'c': + /* console output */; + break; + default: + output_write(STRING_UNRECOGNIZED_SWITCH, argv[i]); + output_write(STRING_USAGE); + return 1; + } } else {