From 3f80fd712e9454834092157c3a25eb471eff4388 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Mon, 4 Jan 2016 13:52:25 +0000
Subject: [PATCH] Use the error context API in the compile_dictrules helper
 function.

---
 src/libespeak-ng/compiledict.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/libespeak-ng/compiledict.c b/src/libespeak-ng/compiledict.c
index b37eaa92..237af92d 100644
--- a/src/libespeak-ng/compiledict.c
+++ b/src/libespeak-ng/compiledict.c
@@ -33,6 +33,7 @@
 #include "espeak_ng.h"
 #include "speak_lib.h"
 
+#include "error.h"
 #include "speech.h"
 #include "phoneme.h"
 #include "synthesize.h"
@@ -174,18 +175,6 @@ int isspace2(unsigned int c)
 	return 1;
 }
 
-static FILE *fopen_log(const char *fname, const char *access)
-{
-	// performs fopen, but produces error message to f_log if it fails
-	FILE *f;
-
-	if ((f = fopen(fname, access)) == NULL) {
-		if (f_log != NULL)
-			fprintf(f_log, "Can't access (%s) file '%s'\n", access, fname);
-	}
-	return f;
-}
-
 // Lookup a mnemonic string in a table, return its name
 const char *LookupMnemName(MNEM_TAB *table, const int value)
 {
@@ -1304,7 +1293,7 @@ static int compile_lettergroup(char *input, FILE *f_out)
 	return 0;
 }
 
-static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
+static espeak_ng_STATUS compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp, espeak_ng_ERROR_CONTEXT *context)
 {
 	char *prule;
 	unsigned char *p;
@@ -1331,8 +1320,8 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
 	linenum = 0;
 	group_name[0] = 0;
 
-	if ((f_temp = fopen_log(fname_temp, "wb")) == NULL)
-		return 1;
+	if ((f_temp = fopen(fname_temp, "wb")) == NULL)
+		return create_file_error_context(context, errno, fname_temp);
 
 	for (;;) {
 		linenum++;
@@ -1476,7 +1465,7 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
 	qsort((void *)rgroup, n_rgroups, sizeof(rgroup[0]), (int(__cdecl *)(const void *, const void *))rgroup_sorter);
 
 	if ((f_temp = fopen(fname_temp, "rb")) == NULL)
-		return 2;
+		return create_file_error_context(context, errno, fname_temp);
 
 	prev_rgroup_name = "\n";
 
@@ -1510,7 +1499,7 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
 	remove(fname_temp);
 
 	fprintf(f_log, "\t%d rules, %d groups (%d)\n\n", count, n_rgroups, n_groups3);
-	return 0;
+	return ENS_OK;
 }
 
 #pragma GCC visibility push(default)
@@ -1583,7 +1572,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_CompileDictionary(const char *dsource,
 
 	fprintf(f_log, "Compiling: '%s'\n", fname_in);
 
-	compile_dictrules(f_in, f_out, fname_temp);
+	espeak_ng_STATUS status = compile_dictrules(f_in, f_out, fname_temp, context);
 	fclose(f_in);
 
 	fseek(f_out, 4, SEEK_SET);
@@ -1591,6 +1580,9 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_CompileDictionary(const char *dsource,
 	fclose(f_out);
 	fflush(f_log);
 
+	if (status != ENS_OK)
+		return status;
+
 	LoadDictionary(translator, dict_name, 0);
 
 	return error_count > 0 ? ENS_COMPILE_ERROR : ENS_OK;