From e016d46a59257bf8b6aa0ce22d4c8c3a952d9704 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 9 Feb 2017 10:54:04 +0100 Subject: [PATCH] Bug 1338086 - Remove useless else blocks in order to reduce complexity modules/libmar/ r=mhowell MozReview-Commit-ID: GyAIRI7Tsei --HG-- extra : rebase_source : f88dafa05230d3c5b79a37e930acfc10e4f4627e --- modules/libmar/tool/mar.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c index f1dd76136775..a2ab75fa502c 100644 --- a/modules/libmar/tool/mar.c +++ b/modules/libmar/tool/mar.c @@ -156,21 +156,22 @@ int main(int argc, char **argv) { } while (argc > 0) { - if (argv[1][0] == '-' && (argv[1][1] == 'c' || - argv[1][1] == 't' || argv[1][1] == 'x' || + if (argv[1][0] == '-' && (argv[1][1] == 'c' || + argv[1][1] == 't' || argv[1][1] == 'x' || argv[1][1] == 'v' || argv[1][1] == 's' || argv[1][1] == 'i' || argv[1][1] == 'T' || argv[1][1] == 'r' || argv[1][1] == 'X' || argv[1][1] == 'I')) { break; /* -C workingdirectory */ - } else if (argv[1][0] == '-' && argv[1][1] == 'C') { + } + if (argv[1][0] == '-' && argv[1][1] == 'C') { if (chdir(argv[2]) != 0) { return -1; } argv += 2; argc -= 2; - } + } #if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \ defined(XP_MACOSX)) /* -D DERFilePath, also matches -D[index] DERFilePath