mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-04 06:32:20 +00:00
Use free instead of Free as free checks for NULL.
This commit is contained in:
@@ -218,7 +218,7 @@ int LoadDictionary(Translator *tr, const char *name, int no_error)
|
||||
size = GetFileLength(fname);
|
||||
|
||||
if (tr->data_dictlist != NULL) {
|
||||
Free(tr->data_dictlist);
|
||||
free(tr->data_dictlist);
|
||||
tr->data_dictlist = NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -261,12 +261,6 @@ char *Alloc(int size)
|
||||
return p;
|
||||
}
|
||||
|
||||
void Free(void *ptr)
|
||||
{
|
||||
if (ptr != NULL)
|
||||
free(ptr);
|
||||
}
|
||||
|
||||
#pragma GCC visibility push(default)
|
||||
|
||||
ESPEAK_NG_API void espeak_ng_InitializePath(const char *path)
|
||||
@@ -884,9 +878,9 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Terminate(void)
|
||||
out_samplerate = 0;
|
||||
}
|
||||
#endif
|
||||
Free(event_list);
|
||||
free(event_list);
|
||||
event_list = NULL;
|
||||
Free(outbuf);
|
||||
free(outbuf);
|
||||
outbuf = NULL;
|
||||
FreePhData();
|
||||
FreeVoiceList();
|
||||
|
||||
@@ -70,7 +70,6 @@ extern char path_home[N_PATH_HOME]; // this is the espeak-data directory
|
||||
extern ESPEAK_NG_API void strncpy0(char *to, const char *from, int size);
|
||||
extern ESPEAK_NG_API int GetFileLength(const char *filename);
|
||||
char *Alloc(int size);
|
||||
void Free(void *ptr);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ static espeak_ng_STATUS ReadPhFile(void **ptr, const char *fname, int *size, esp
|
||||
return create_file_error_context(context, errno, buf);
|
||||
|
||||
if (*ptr != NULL)
|
||||
Free(*ptr);
|
||||
free(*ptr);
|
||||
|
||||
if ((*ptr = Alloc(length)) == NULL) {
|
||||
fclose(f_in);
|
||||
@@ -95,7 +95,7 @@ static espeak_ng_STATUS ReadPhFile(void **ptr, const char *fname, int *size, esp
|
||||
if (fread(*ptr, 1, length, f_in) != length) {
|
||||
int error = errno;
|
||||
fclose(f_in);
|
||||
Free(*ptr);
|
||||
free(*ptr);
|
||||
return create_file_error_context(context, error, buf);
|
||||
}
|
||||
|
||||
@@ -166,10 +166,10 @@ espeak_ng_STATUS LoadPhData(int *srate, espeak_ng_ERROR_CONTEXT *context)
|
||||
|
||||
void FreePhData(void)
|
||||
{
|
||||
Free(phoneme_tab_data);
|
||||
Free(phoneme_index);
|
||||
Free(phondata_ptr);
|
||||
Free(tunes);
|
||||
free(phoneme_tab_data);
|
||||
free(phoneme_index);
|
||||
free(phondata_ptr);
|
||||
free(tunes);
|
||||
phoneme_tab_data = NULL;
|
||||
phoneme_index = NULL;
|
||||
phondata_ptr = NULL;
|
||||
|
||||
@@ -444,8 +444,8 @@ int IsSpace(unsigned int c)
|
||||
void DeleteTranslator(Translator *tr)
|
||||
{
|
||||
if (tr->data_dictlist != NULL)
|
||||
Free(tr->data_dictlist);
|
||||
Free(tr);
|
||||
free(tr->data_dictlist);
|
||||
free(tr);
|
||||
}
|
||||
|
||||
int lookupwchar(const unsigned short *list, int c)
|
||||
|
||||
Reference in New Issue
Block a user