From b4f40d0011173ee071a71be0c7faddfae097c0b8 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Fri, 27 Aug 2004 16:20:09 +0000 Subject: [PATCH] epicsStdioRedirect --- src/as/asCa.c | 2 +- src/as/asDbLib.c | 2 +- src/as/asLibRoutines.c | 7 ++++--- src/as/asTrapWrite.c | 1 + src/as/ascheck.c | 11 ++++++----- src/db/dbCaTest.c | 1 + src/db/dbLock.c | 1 + src/db/dbScan.c | 1 + src/db/dbTest.c | 1 + src/db/db_test.c | 1 + src/dbStatic/dbStaticLib.c | 4 ++-- src/misc/epicsRelease.c | 1 + src/rsrv/caservertask.c | 1 + 13 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/as/asCa.c b/src/as/asCa.c index 537f8734f..67f784275 100644 --- a/src/as/asCa.c +++ b/src/as/asCa.c @@ -30,7 +30,7 @@ #include "caerr.h" #include "caeventmask.h" #include "alarm.h" -#include "epicsStdio.h" +#include "epicsStdioRedirect.h" #include "epicsExport.h" #include "asLib.h" diff --git a/src/as/asDbLib.c b/src/as/asDbLib.c index f859c1b01..6f409f17c 100644 --- a/src/as/asDbLib.c +++ b/src/as/asDbLib.c @@ -15,7 +15,7 @@ #include #include -#include "epicsStdio.h" +#include "epicsStdioRedirect.h" #include "dbDefs.h" #include "cantProceed.h" #include "epicsThread.h" diff --git a/src/as/asLibRoutines.c b/src/as/asLibRoutines.c index 4ecbb6a44..873f7b80c 100644 --- a/src/as/asLibRoutines.c +++ b/src/as/asLibRoutines.c @@ -16,6 +16,7 @@ #include #include +#include "epicsStdioRedirect.h" #include "dbDefs.h" #include "epicsThread.h" #include "ellLib.h" @@ -281,7 +282,7 @@ long epicsShareAPI asRemoveMember(ASMEMBERPVT *asMemberPvt) } else { errMessage(-1,"Logic error in asRemoveMember"); UNLOCK; - exit(-1); + return(-1); } free((void *)pasgmember); *asMemberPvt = NULL; @@ -303,7 +304,7 @@ long epicsShareAPI asChangeGroup(ASMEMBERPVT *asMemberPvt,const char *newAsgName } else { errMessage(-1,"Logic error in asChangeGroup"); UNLOCK; - exit(-1); + return(-1); } status = asAddMemberPvt(asMemberPvt,newAsgName); UNLOCK; @@ -868,7 +869,7 @@ static long asAddMemberPvt(ASMEMBERPVT *pasMemberPvt,const char *asgName) pgroup = (ASG *)ellNext((ELLNODE *)pgroup); } errMessage(-1,"Logic Error in asAddMember"); - exit(1); + return(-1); got_it: pasgmember->pasg = pgroup; ellAdd(&pgroup->memberList,(ELLNODE *)pasgmember); diff --git a/src/as/asTrapWrite.c b/src/as/asTrapWrite.c index 29a7f92ff..7c2536f93 100644 --- a/src/as/asTrapWrite.c +++ b/src/as/asTrapWrite.c @@ -22,6 +22,7 @@ #include "ellLib.h" #include "freeList.h" +#include "epicsStdioRedirect.h" #include "cantProceed.h" #include "epicsMutex.h" #include "ellLib.h" diff --git a/src/as/ascheck.c b/src/as/ascheck.c index 436c1aad1..4982762e5 100644 --- a/src/as/ascheck.c +++ b/src/as/ascheck.c @@ -29,7 +29,7 @@ int main(int argc,char **argv) char **pstr; char *psep; int *len; - long status; + long status = 0; static char *subSep = ","; /*Look for options*/ @@ -49,9 +49,10 @@ int main(int argc,char **argv) } if(argc!=1) { printf("usage: ascheck -Smacsub < file\n"); - exit(0); + status = -1; + } else { + status = asInitFP(stdin,sub); + if(status) errMessage(status,"from asInitFP"); } - status = asInitFP(stdin,sub); - if(status) errMessage(status,"from asInitFP"); - return(0); + return(status); } diff --git a/src/db/dbCaTest.c b/src/db/dbCaTest.c index 70faeddbc..3a3a0e2a7 100644 --- a/src/db/dbCaTest.c +++ b/src/db/dbCaTest.c @@ -22,6 +22,7 @@ #include #include "dbStaticLib.h" +#include "epicsStdioRedirect.h" #include "link.h" /*definitions needed because of old vs new database access*/ #undef DBR_SHORT diff --git a/src/db/dbLock.c b/src/db/dbLock.c index a6d9f5356..176c6bef7 100644 --- a/src/db/dbLock.c +++ b/src/db/dbLock.c @@ -47,6 +47,7 @@ since this will delay all other threads. #include #include +#include "epicsStdioRedirect.h" #include "dbDefs.h" #include "dbBase.h" #include "epicsMutex.h" diff --git a/src/db/dbScan.c b/src/db/dbScan.c index 8b9a1f625..ed2818801 100644 --- a/src/db/dbScan.c +++ b/src/db/dbScan.c @@ -22,6 +22,7 @@ #include #include +#include "epicsStdioRedirect.h" #include "dbDefs.h" #include "ellLib.h" #include "taskwd.h" diff --git a/src/db/dbTest.c b/src/db/dbTest.c index 46ae86896..7cf1ce2c1 100644 --- a/src/db/dbTest.c +++ b/src/db/dbTest.c @@ -21,6 +21,7 @@ #include "errlog.h" #include "ellLib.h" #include "epicsMutex.h" +#include "epicsStdioRedirect.h" #include "ellLib.h" #include "dbBase.h" #include "dbStaticLib.h" diff --git a/src/db/db_test.c b/src/db/db_test.c index c6f4404ac..31b740b18 100644 --- a/src/db/db_test.c +++ b/src/db/db_test.c @@ -21,6 +21,7 @@ #include "dbDefs.h" #include "errlog.h" #include "cadef.h" +#include "epicsStdioRedirect.h" #define epicsExportSharedSymbols #include "db_access_routines.h" #include "dbNotify.h" diff --git a/src/dbStatic/dbStaticLib.c b/src/dbStatic/dbStaticLib.c index bd0c3d2af..d892454ac 100644 --- a/src/dbStatic/dbStaticLib.c +++ b/src/dbStatic/dbStaticLib.c @@ -32,7 +32,7 @@ #include "dbmf.h" #include "postfix.h" #include "osiFileName.h" -#include "epicsStdio.h" +#include "epicsStdioRedirect.h" #define epicsExportSharedSymbols #include "link.h" @@ -1729,7 +1729,7 @@ long epicsShareAPI dbCopyRecord(DBENTRY *pdbentry,const char *newRecordName,int if(!status) status = dbNextField(&dbentry,TRUE); if(!status && (pdbentry->pflddes!=dbentry.pflddes)) { epicsPrintf("dbCopyRecord: Logic Error\n"); - exit(1); + return(-1); } } /*Copy the info strings too*/ diff --git a/src/misc/epicsRelease.c b/src/misc/epicsRelease.c index d6e5ea2f8..5c317dfff 100644 --- a/src/misc/epicsRelease.c +++ b/src/misc/epicsRelease.c @@ -13,6 +13,7 @@ #include #include #include "epicsVersion.h" +#include "epicsStdioRedirect.h" #define epicsExportSharedSymbols #include "epicsRelease.h" diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c index 6c4c116c8..9d284e3f1 100644 --- a/src/rsrv/caservertask.c +++ b/src/rsrv/caservertask.c @@ -38,6 +38,7 @@ #include "dbAddr.h" #include "dbEvent.h" #include "dbCommon.h" +#include "epicsStdioRedirect.h" #define epicsExportSharedSymbols #include "rsrv.h"