From 77eb4262f2717f83d4f11549975cc02a2b2d993e Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 3 Jan 2016 14:21:13 +0000 Subject: [PATCH] Use espeak_ng_PrintStatusCodeMessage for espeak_ng_Initialize error formatting. --- src/espeak-ng.c | 5 +---- src/libespeak-ng/espeak_api.c | 10 +++------- src/speak-ng.c | 5 +---- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/espeak-ng.c b/src/espeak-ng.c index 25b56737..c507e95b 100644 --- a/src/espeak-ng.c +++ b/src/espeak-ng.c @@ -590,10 +590,7 @@ int main(int argc, char **argv) espeak_ng_InitializePath(data_path); espeak_ng_STATUS result = espeak_ng_Initialize(); if (result != ENS_OK) { - if (result == ENS_VERSION_MISMATCH) - fprintf(stderr, "Wrong version of espeak-data\n"); - else - fprintf(stderr, "Failed to load espeak-data\n"); + espeak_ng_PrintStatusCodeMessage(result, stderr); exit(1); } diff --git a/src/libespeak-ng/espeak_api.c b/src/libespeak-ng/espeak_api.c index ccd7bba2..b913be5c 100644 --- a/src/libespeak-ng/espeak_api.c +++ b/src/libespeak-ng/espeak_api.c @@ -55,13 +55,9 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output_type, int buf_length espeak_ng_InitializePath(path); espeak_ng_STATUS result = espeak_ng_Initialize(); if (result != ENS_OK) { - if (result == ENS_VERSION_MISMATCH) - fprintf(stderr, "Wrong version of espeak-data\n"); - else { - fprintf(stderr, "Failed to load espeak-data\n"); - if ((options & espeakINITIALIZE_DONT_EXIT) == 0) - exit(1); - } + espeak_ng_PrintStatusCodeMessage(result, stderr); + if ((options & espeakINITIALIZE_DONT_EXIT) == 0) + exit(1); } switch (output_type) diff --git a/src/speak-ng.c b/src/speak-ng.c index 8256cee6..b66abb8a 100644 --- a/src/speak-ng.c +++ b/src/speak-ng.c @@ -577,10 +577,7 @@ int main(int argc, char **argv) espeak_ng_InitializePath(data_path); espeak_ng_STATUS result = espeak_ng_Initialize(); if (result != ENS_OK) { - if (result == ENS_VERSION_MISMATCH) - fprintf(stderr, "Wrong version of espeak-data (expected 0x%x) at %s\n", version_phdata, path_home); - else - fprintf(stderr, "Failed to load espeak-data\n"); + espeak_ng_PrintStatusCodeMessage(result, stderr); exit(1); }