mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 21:39:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.29.15] Fix compiler warning, conversion from string constant to 'char *'.

Browse Source 
espeakedit: Change compile_report file to include the phoneme name as well as phoneme table which uses each data file.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@95 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-11-01 19:09:27 +00:00
parent 9543dcc00d
commit 531de957cd
30 changed files with 2128 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiledict.cpp
+16 -14
View File
@@ -163,9 +163,9 @@ int compile_line(char *linebuf, char *dict_line, int *hash)
char *p;
char *word;
char *phonetic;
int ix;
unsigned int ix;
int step;
int n_flag_codes = 0;
unsigned int n_flag_codes = 0;
int flag_offset;
int length;
int multiple_words = 0;
@@ -181,10 +181,11 @@ int compile_line(char *linebuf, char *dict_line, int *hash)
unsigned char flag_codes[100];
char encoded_ph[200];
unsigned char bad_phoneme[4];
static char nullstring[] = {0};
comment = NULL;
text_not_phonemes = 0;
phonetic = word = "";
phonetic = word = nullstring;
p = linebuf;
// while(isspace2(*p)) p++;
@@ -1219,7 +1220,7 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
int n_rules=0;
int count=0;
int different;
char *prev_rgroup_name;
const char *prev_rgroup_name;
unsigned int char_code;
int compile_mode=0;
char *buf;
@@ -1247,16 +1248,6 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
if(buf[0] == '\r') buf++; // ignore extra \r in \r\n
}
if((buf != NULL) && (memcmp(buf,".L",2)==0))
{
if(compile_lettergroup(&buf[2], f_out) != 0)
{
fprintf(f_log,"%5d: Bad lettergroup\n",linenum);
error_count++;
}
continue;
}
if((buf == NULL) || (buf[0] == '.'))
{
// next .group or end of file, write out the previous group
@@ -1277,10 +1268,21 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
{
// end of the character replacements section
fwrite(&n_rules,1,4,f_out); // write a zero word to terminate the replacemenmt list
compile_mode = 0;
}
if(buf == NULL) break; // end of file
if(memcmp(buf,".L",2)==0)
{
if(compile_lettergroup(&buf[2], f_out) != 0)
{
fprintf(f_log,"%5d: Bad lettergroup\n",linenum);
error_count++;
}
continue;
}
if(memcmp(buf,".replace",8)==0)
{
compile_mode = 2;