From 9e643b56209c8aee884fafba43c8e02bb5ee12ec Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Wed, 30 Dec 2015 15:54:32 +0000 Subject: [PATCH] Fix clang -Wunreachable-code-break warnings. --- src/espeak-ng.c | 3 +-- src/libespeak-ng/synthdata.c | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/espeak-ng.c b/src/espeak-ng.c index 3eae76ba..93f1f46a 100644 --- a/src/espeak-ng.c +++ b/src/espeak-ng.c @@ -437,8 +437,7 @@ int main(int argc, char **argv) printf("\n"); PrintVersion(); printf("%s", help_text); - exit(0); - break; + return 0; case 'k': option_capitals = atoi(optarg2); break; diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c index c9144ef3..dfd75704 100644 --- a/src/libespeak-ng/synthdata.c +++ b/src/libespeak-ng/synthdata.c @@ -651,15 +651,12 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist, case 0x00: // phoneme type, vowel, nasal, fricative, etc return ph->type == data; - break; case 0x20: // place of articulation return ((ph->phflags >> 16) & 0xf) == data; - break; case 0x40: // is a bit set in phoneme flags return (ph->phflags & (1 << data)) != 0; - break; case 0x80: switch (data) { @@ -677,7 +674,6 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist, return plist->sourceix == 0; case 8: // isWordEnd return plist[1].sourceix || (plist[1].ph->type == phPAUSE); - break; case 9: // isAfterStress if (plist->sourceix != 0) return false; @@ -698,7 +694,6 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist, if (plist->ph->type == phVOWEL) return false; } - break; case 12: // isVoiced return (ph->type == phVOWEL) || (ph->type == phLIQUID) || (ph->phflags & phVOICED); case 13: // isFirstVowel