diff --git a/modules/database/src/ioc/dbStatic/dbLexRoutines.c b/modules/database/src/ioc/dbStatic/dbLexRoutines.c index 16124d64e..0b90f4b08 100644 --- a/modules/database/src/ioc/dbStatic/dbLexRoutines.c +++ b/modules/database/src/ioc/dbStatic/dbLexRoutines.c @@ -1086,7 +1086,7 @@ int dbRecordNameValidate(const char *name) name, c); } else if(c==' ' || c=='\t' || c=='"' || c=='\'' || c=='.' || c=='$') { - epicsPrintf("Error: Bad character '%c' in Record/Alias name \"%s\"\n", + epicsPrintf(ERL_ERROR ": Bad character '%c' in Record/Alias name \"%s\"\n", c, name); yyerrorAbort(NULL); return 1; diff --git a/modules/database/src/ioc/dbStatic/dbStaticLib.c b/modules/database/src/ioc/dbStatic/dbStaticLib.c index f8fa7608a..2e3811dca 100644 --- a/modules/database/src/ioc/dbStatic/dbStaticLib.c +++ b/modules/database/src/ioc/dbStatic/dbStaticLib.c @@ -2204,11 +2204,11 @@ long dbInitRecordLinks(dbRecordType *rtyp, struct dbCommon *prec) */ } else if(dbCanSetLink(plink, &link_info, devsup)!=0) { - errlogPrintf("Error: %s.%s: can't initialize link type %d with \"%s\" (type %d)\n", + errlogPrintf(ERL_ERROR ": %s.%s: can't initialize link type %d with \"%s\" (type %d)\n", prec->name, pflddes->name, plink->type, plink->text, link_info.ltype); } else if(dbSetLink(plink, &link_info, devsup)) { - errlogPrintf("Error: %s.%s: failed to initialize link type %d with \"%s\" (type %d)\n", + errlogPrintf(ERL_ERROR ": %s.%s: failed to initialize link type %d with \"%s\" (type %d)\n", prec->name, pflddes->name, plink->type, plink->text, link_info.ltype); } free(plink->text); diff --git a/modules/database/src/ioc/dbStatic/dbStaticRun.c b/modules/database/src/ioc/dbStatic/dbStaticRun.c index 198ff5c1a..ee9480c54 100644 --- a/modules/database/src/ioc/dbStatic/dbStaticRun.c +++ b/modules/database/src/ioc/dbStatic/dbStaticRun.c @@ -143,7 +143,7 @@ long dbAllocRecord(DBENTRY *pdbentry,const char *precordName) status = dbPutStringNum(pdbentry,pflddes->initial); if(status) - epicsPrintf("Error initializing %s.%s initial %s\n", + epicsPrintf(ERL_ERROR " initializing %s.%s initial %s\n", pdbRecordType->name,pflddes->name,pflddes->initial); } break; diff --git a/modules/database/src/ioc/dbStatic/dbYacc.y b/modules/database/src/ioc/dbStatic/dbYacc.y index 75fb86cf0..369fd914f 100644 --- a/modules/database/src/ioc/dbStatic/dbYacc.y +++ b/modules/database/src/ioc/dbStatic/dbYacc.y @@ -370,9 +370,9 @@ json_value: jsonNULL { $$ = dbmfStrdup("null"); } static int yyerror(char *str) { if (str) - epicsPrintf("Error: %s\n", str); + epicsPrintf(ERL_ERROR ": %s\n", str); else - epicsPrintf("Error"); + epicsPrintf(ERL_ERROR ""); if (!yyFailed) { /* Only print this stuff once */ epicsPrintf(" at or before '%s'", yytext); dbIncludePrint(); diff --git a/modules/database/src/ioc/misc/iocInit.c b/modules/database/src/ioc/misc/iocInit.c index 3be83adbe..1b1d4fc0b 100644 --- a/modules/database/src/ioc/misc/iocInit.c +++ b/modules/database/src/ioc/misc/iocInit.c @@ -173,7 +173,7 @@ static int iocBuild_2(void) scanInit(); if (asInit()) { - errlogPrintf("iocBuild: asInit Failed.\n"); + errlogPrintf(ERL_ERROR " iocBuild: asInit Failed.\n"); return -1; } dbProcessNotifyInit(); diff --git a/modules/libcom/src/as/asLib.y b/modules/libcom/src/as/asLib.y index ca22ee55f..1e7397123 100644 --- a/modules/libcom/src/as/asLib.y +++ b/modules/libcom/src/as/asLib.y @@ -209,7 +209,7 @@ static int yyerror(char *str) if (strlen(str)) errlogPrintf("%s at line %d\n", str, line_num); else - errlogPrintf("Error at line %d\n", line_num); + errlogPrintf(ERL_ERROR " at line %d\n", line_num); yyFailed = TRUE; return 0; } diff --git a/modules/libcom/src/pool/threadPool.c b/modules/libcom/src/pool/threadPool.c index d4f009107..a353aa31a 100644 --- a/modules/libcom/src/pool/threadPool.c +++ b/modules/libcom/src/pool/threadPool.c @@ -42,7 +42,7 @@ epicsThreadPool* epicsThreadPoolCreate(epicsThreadPoolConfig *opts) /* caller likely didn't initialize the options structure */ if (opts && opts->maxThreads == 0) { - errlogMessage("Error: epicsThreadPoolCreate() options provided, but not initialized"); + errlogMessage(ERL_ERROR ": epicsThreadPoolCreate() options provided, but not initialized"); return NULL; } @@ -78,7 +78,7 @@ epicsThreadPool* epicsThreadPoolCreate(epicsThreadPoolConfig *opts) if (pool->threadsRunning == 0 && pool->conf.initialThreads != 0) { epicsMutexUnlock(pool->guard); - errlogPrintf("Error: Unable to create any threads for thread pool\n"); + errlogPrintf(ERL_ERROR ": Unable to create any threads for thread pool\n"); goto cleanup; }