epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Cleaned up error message output formatting.

Browse Source
This commit is contained in:
Andrew Johnson
2007-04-18 19:57:17 +00:00
parent 179e82b2c9
commit f0855d95de
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dbStatic/dbLexRoutines.c
View File

@@ -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;

8
src/dbStatic/dbYacc.y
View File

@@ -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);
}