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

code cleanup: move strncpy0 to common.c

Browse Source
This commit is contained in:
Juho Hiltunen
2022-09-04 07:12:39 +03:00
parent c4d8976fbc
commit b52d1f3afd
11 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/common.c
+6
View File
@@ -51,4 +51,10 @@ int GetFileLength(const char *filename)
return statbuf.st_size;
}
void strncpy0(char *to, const char *from, int size)
{
// strcpy with limit, ensures a zero terminator
strncpy(to, from, size);
to[size-1] = 0;
}
#pragma GCC visibility pop
src/libespeak-ng/common.h
+1
View File
@@ -23,6 +23,7 @@
#include "espeak-ng/espeak_ng.h"
extern ESPEAK_NG_API int GetFileLength(const char *filename);
extern ESPEAK_NG_API void strncpy0(char *to, const char *from, int size);
#ifdef __cplusplus
}
src/libespeak-ng/compiledata.c
+1 -2
View File
@@ -35,8 +35,7 @@
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "common.h" // for GetFileLength
#include "dictionary.h" // for strncpy0
#include "common.h" // for GetFileLength, strncpy0
#include "error.h" // for create_file_error_context
#include "mnemonics.h" // for LookupMnemName, MNEM_TAB
#include "phoneme.h" // for PHONEME_TAB, PHONEME_TAB_LIST
src/libespeak-ng/compiledict.c
+2 -1
View File
@@ -33,8 +33,9 @@
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "common.h" // for strncpy0
#include "compiledict.h"
#include "dictionary.h" // for EncodePhonemes, strncpy0, HashDicti...
#include "dictionary.h" // for EncodePhonemes, HashDicti...
#include "error.h" // for create_file_error_context
#include "mnemonics.h" // for LookupMnemName, MNEM_TAB
#include "phoneme.h" // for PHONEME_TAB_LIST, phonSWITCH, phone...
src/libespeak-ng/dictionary.c
+1 -10
View File
@@ -32,7 +32,7 @@
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
#include "common.h" // for GetFileLength
#include "common.h" // for GetFileLength, strncpy0
#include "dictionary.h"
#include "numbers.h" // for LookupAccentedLetter, Look...
#include "phoneme.h" // for PHONEME_TAB, phVOWEL, phon...
@@ -91,15 +91,6 @@ static unsigned char remove_accent[N_REMOVE_ACCENT] = {
'a', 'a', 'a', 'b', 'o', 'c', 'd', 'd', 'e', 'e', 'e', 'e', 'e', 'e'
};
#pragma GCC visibility push(default)
void strncpy0(char *to, const char *from, int size)
{
// strcpy with limit, ensures a zero terminator
strncpy(to, from, size);
to[size-1] = 0;
}
#pragma GCC visibility pop
static int Reverse4Bytes(int word)
{
// reverse the order of bytes from little-endian to big-endian
src/libespeak-ng/dictionary.h
-1
View File
@@ -31,7 +31,6 @@ extern "C"
{
#endif
extern ESPEAK_NG_API void strncpy0(char *to, const char *from, int size);
int LoadDictionary(Translator *tr, const char *name, int no_error);
int HashDictionary(const char *string);
const char *EncodePhonemes(const char *p, char *outptr, int *bad_phoneme);
src/libespeak-ng/error.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include <espeak-ng/espeak_ng.h>
#include "error.h"
#include "dictionary.h" // for strncpy0
#include "common.h" // for strncpy0
espeak_ng_STATUS
create_file_error_context(espeak_ng_ERROR_CONTEXT *context,
src/libespeak-ng/readclause.c
+1 -1
View File
@@ -37,7 +37,7 @@
#include <ucd/ucd.h>
#include "readclause.h"
#include "common.h" // for GetFileLength
#include "common.h" // for GetFileLength, strncpy0
#include "config.h" // for HAVE_MKSTEMP
#include "dictionary.h" // for LookupDictList, DecodePhonemes, Set...
#include "error.h" // for create_file_error_context
src/libespeak-ng/ssml.c
+1 -1
View File
@@ -40,7 +40,7 @@
#include <ucd/ucd.h>
#include "ssml.h"
#include "dictionary.h" // for strncpy0
#include "common.h" // for strncpy0
#include "mnemonics.h" // for LookupMnemName, MNEM_TAB,
#include "readclause.h" // for PARAM_STACK, param_stack, AddNameData
#include "soundicon.h" // for LoadSoundFile2
src/libespeak-ng/translateword.c
+3 -1
View File
@@ -34,6 +34,8 @@
#include <espeak-ng/encoding.h>
#include "translate.h"
#include "translateword.h"
#include "common.h" // for strncpy0
#include "dictionary.h" // for TranslateRules, LookupDictList, Cha...
#include "numbers.h" // for SetSpellingStress, ...
#include "phoneme.h" // for phonSWITCH, PHONEME_TAB, phonPAUSE_...
@@ -41,7 +43,7 @@
#include "synthdata.h" // for SelectPhonemeTable, LookupPhonemeTable
#include "ucd/ucd.h" // for ucd_toupper
#include "voice.h" // for voice, voice_t
#include "translateword.h"
static void addPluralSuffixes(int flags, Translator *tr, char last_char, char *word_phonemes);
static int CheckDottedAbbrev(char *word1);
src/libespeak-ng/voices.c
+2 -2
View File
@@ -39,8 +39,8 @@
#include <espeak-ng/encoding.h>
#include "voice.h" // for voice_t, DoVoiceChange, N_PEAKS
#include "common.h" // for GetFileLength
#include "dictionary.h" // for strncpy0, LoadDictionary
#include "common.h" // for GetFileLength, strncpy0
#include "dictionary.h" // for LoadDictionary
#include "mnemonics.h" // for LookupMnemName, MNEM_TAB
#include "phoneme.h" // for REPLACE_PHONEMES, n_replace_pho...
#include "speech.h" // for PATHSEP