From 65847bd251004f0a1d5d11cdde469dfed9980fbf Mon Sep 17 00:00:00 2001 From: Juho Hiltunen Date: Tue, 21 Jul 2020 11:25:58 +0300 Subject: [PATCH] code cleanup: remove phoneme_tab_flags It is memset and set once, but never checked or used for anything. --- src/libespeak-ng/phoneme.h | 1 - src/libespeak-ng/synthdata.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/src/libespeak-ng/phoneme.h b/src/libespeak-ng/phoneme.h index 9e38cf94..e46a3927 100644 --- a/src/libespeak-ng/phoneme.h +++ b/src/libespeak-ng/phoneme.h @@ -250,7 +250,6 @@ phoneme_add_feature(PHONEME_TAB *phoneme, // one for the current voice extern int n_phoneme_tab; extern PHONEME_TAB *phoneme_tab[N_PHONEME_TAB]; -extern unsigned char phoneme_tab_flags[N_PHONEME_TAB]; // bit 0: not inherited typedef struct { char name[N_PHONEME_TAB_NAME]; diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c index e1f7bdd7..58cbd56d 100644 --- a/src/libespeak-ng/synthdata.c +++ b/src/libespeak-ng/synthdata.c @@ -46,7 +46,6 @@ const int version_phdata = 0x014801; // copy the current phoneme table into here int n_phoneme_tab; PHONEME_TAB *phoneme_tab[N_PHONEME_TAB]; -unsigned char phoneme_tab_flags[N_PHONEME_TAB]; // bit 0: not inherited unsigned short *phoneme_index = NULL; char *phondata_ptr = NULL; @@ -337,9 +336,6 @@ static void SetUpPhonemeTable(int number, bool recursing) int ph_code; PHONEME_TAB *phtab; - if (recursing == false) - memset(phoneme_tab_flags, 0, sizeof(phoneme_tab_flags)); - if ((includes = phoneme_tab_list[number].includes) > 0) { // recursively include base phoneme tables SetUpPhonemeTable(includes-1, true); @@ -352,9 +348,6 @@ static void SetUpPhonemeTable(int number, bool recursing) phoneme_tab[ph_code] = &phtab[ix]; if (ph_code > n_phoneme_tab) n_phoneme_tab = ph_code; - - if (recursing == 0) - phoneme_tab_flags[ph_code] |= 1; // not inherited } }