From f0855d95decfb96492b81954b0103b2cfc254e65 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 18 Apr 2007 19:57:17 +0000
Subject: [PATCH] Cleaned up error message output formatting.

---
 src/dbStatic/dbLexRoutines.c | 14 +++++++-------
 src/dbStatic/dbYacc.y        |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/dbStatic/dbLexRoutines.c b/src/dbStatic/dbLexRoutines.c
index 073745ad9..184f88f21 100644
--- a/src/dbStatic/dbLexRoutines.c
+++ b/src/dbStatic/dbLexRoutines.c
@@ -51,7 +51,7 @@ static void allocTemp(void *pvoid);
 static void *popFirstTemp(void);
 static void *getLastTemp(void);
 static int db_yyinput(char *buf,int max_size);
-static void dbIncludePrint(FILE *fp);
+static void dbIncludePrint(void);
 static void dbPathCmd(char *path);
 static void dbAddPathCmd(char *path);
 static void dbIncludeNew(char *include_file);
@@ -343,20 +343,20 @@ static int db_yyinput(char *buf, int max_size)
     return(n);
 }
 
-static void dbIncludePrint(FILE *fp)
+static void dbIncludePrint(void)
 {
     inputFile *pinputFile = pinputFileNow;
 
     while (pinputFile) {
-	fprintf(fp, "   in");
+	epicsPrintf(" in");
 	if (pinputFile->path)
-	    fprintf(fp, " path \"%s\" ",pinputFile->path);
+	    epicsPrintf(" path \"%s\" ",pinputFile->path);
 	if (pinputFile->filename) {
-	    fprintf(fp, " file %s",pinputFile->filename);
+	    epicsPrintf(" file \"%s\"",pinputFile->filename);
 	} else {
-	    fprintf(fp, " standard input");
+	    epicsPrintf(" standard input");
 	}
-	fprintf(fp, " line %d\n",pinputFile->line_num);
+	epicsPrintf(" line %d\n",pinputFile->line_num);
 	pinputFile = (inputFile *)ellPrevious(&pinputFile->node);
     }
     return;
diff --git a/src/dbStatic/dbYacc.y b/src/dbStatic/dbYacc.y
index 9ed514237..298a04abd 100644
--- a/src/dbStatic/dbYacc.y
+++ b/src/dbStatic/dbYacc.y
@@ -248,11 +248,11 @@ record_field: tokenFIELD '(' tokenSTRING ',' tokenSTRING ')'
 static int yyerror(char *str)
 {
     if (str)
-        fprintf(stderr, "Error: %s\n", str);
+        epicsPrintf("Error: %s\n", str);
     else
-        fprintf(stderr,"Error.\n");
-    fprintf(stderr,"Parsing '%s'\n", yytext);
-    dbIncludePrint(stderr);
+        epicsPrintf("Error\n");
+    epicsPrintf("    at or before \"%s\"", yytext);
+    dbIncludePrint();
     yyFailed = TRUE;
     return(0);
 }