Bug 1338086 - Remove useless else blocks in order to reduce complexity modules/libmar/ r=mhowell

MozReview-Commit-ID: GyAIRI7Tsei

--HG--
extra : rebase_source : f88dafa05230d3c5b79a37e930acfc10e4f4627e
This commit is contained in:
Sylvestre Ledru 2017-02-09 10:54:04 +01:00
parent 83bb719105
commit e016d46a59

View File

@ -156,21 +156,22 @@ int main(int argc, char **argv) {
} }
while (argc > 0) { while (argc > 0) {
if (argv[1][0] == '-' && (argv[1][1] == 'c' || if (argv[1][0] == '-' && (argv[1][1] == 'c' ||
argv[1][1] == 't' || argv[1][1] == 'x' || argv[1][1] == 't' || argv[1][1] == 'x' ||
argv[1][1] == 'v' || argv[1][1] == 's' || argv[1][1] == 'v' || argv[1][1] == 's' ||
argv[1][1] == 'i' || argv[1][1] == 'T' || argv[1][1] == 'i' || argv[1][1] == 'T' ||
argv[1][1] == 'r' || argv[1][1] == 'X' || argv[1][1] == 'r' || argv[1][1] == 'X' ||
argv[1][1] == 'I')) { argv[1][1] == 'I')) {
break; break;
/* -C workingdirectory */ /* -C workingdirectory */
} else if (argv[1][0] == '-' && argv[1][1] == 'C') { }
if (argv[1][0] == '-' && argv[1][1] == 'C') {
if (chdir(argv[2]) != 0) { if (chdir(argv[2]) != 0) {
return -1; return -1;
} }
argv += 2; argv += 2;
argc -= 2; argc -= 2;
} }
#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \ #if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \
defined(XP_MACOSX)) defined(XP_MACOSX))
/* -D DERFilePath, also matches -D[index] DERFilePath /* -D DERFilePath, also matches -D[index] DERFilePath