diff --git a/src/ca/cadef.h b/src/ca/cadef.h index c0fd976b9..b3ff33c6d 100644 --- a/src/ca/cadef.h +++ b/src/ca/cadef.h @@ -920,7 +920,7 @@ epicsShareFunc READONLY char * epicsShareAPI ca_version (void); * CA prints an error message */ #ifndef CA_DONT_INCLUDE_STDARGH -typedef int epicsShareAPIV caPrintfFunc (const char *pformat, va_list args); +typedef int caPrintfFunc (const char *pformat, va_list args); epicsShareFunc int epicsShareAPI ca_replace_printf_handler ( caPrintfFunc *ca_printf_func ); diff --git a/src/libCom/error/errlog.c b/src/libCom/error/errlog.c index d60b15d7a..7cbe4e5f8 100644 --- a/src/libCom/error/errlog.c +++ b/src/libCom/error/errlog.c @@ -94,7 +94,7 @@ LOCAL struct { void *pbuffer; }pvtData; -epicsShareFunc int epicsShareAPIV errlogPrintf( const char *pFormat, ...) +epicsShareFunc int errlogPrintf( const char *pFormat, ...) { va_list pvar; int nchar; @@ -111,7 +111,7 @@ epicsShareFunc int epicsShareAPIV errlogPrintf( const char *pFormat, ...) return(nchar); } -epicsShareFunc int epicsShareAPIV errlogVprintf( +epicsShareFunc int errlogVprintf( const char *pFormat,va_list pvar) { int nchar; @@ -147,7 +147,7 @@ epicsShareFunc int epicsShareAPI errlogMessage(const char *message) return 0; } -epicsShareFunc int epicsShareAPIV errlogSevPrintf( +epicsShareFunc int errlogSevPrintf( const errlogSevEnum severity,const char *pFormat, ...) { va_list pvar; @@ -166,7 +166,7 @@ epicsShareFunc int epicsShareAPIV errlogSevPrintf( return(nchar); } -epicsShareFunc int epicsShareAPIV errlogSevVprintf( +epicsShareFunc int errlogSevVprintf( const errlogSevEnum severity,const char *pFormat,va_list pvar) { char *pnext; @@ -256,7 +256,7 @@ epicsShareFunc int epicsShareAPI eltc(int yesno) return(0); } -epicsShareFunc void epicsShareAPIV errPrintf(long status, const char *pFileName, +epicsShareFunc void errPrintf(long status, const char *pFileName, int lineno, const char *pformat, ...) { va_list pvar; diff --git a/src/libCom/error/errlog.h b/src/libCom/error/errlog.h index 7a8649b4c..1ec93e68b 100644 --- a/src/libCom/error/errlog.h +++ b/src/libCom/error/errlog.h @@ -38,13 +38,13 @@ epicsShareDef char * errlogSevEnumString[] = {"info","minor","major","fatal"}; epicsShareExtern char * errlogSevEnumString[]; #endif -epicsShareFunc int epicsShareAPIV errlogPrintf( +epicsShareFunc int errlogPrintf( const char *pformat, ...); -epicsShareFunc int epicsShareAPIV errlogVprintf( +epicsShareFunc int errlogVprintf( const char *pformat,va_list pvar); -epicsShareFunc int epicsShareAPIV errlogSevPrintf( +epicsShareFunc int errlogSevPrintf( const errlogSevEnum severity,const char *pformat, ...); -epicsShareFunc int epicsShareAPIV errlogSevVprintf( +epicsShareFunc int errlogSevVprintf( const errlogSevEnum severity,const char *pformat,va_list pvar); epicsShareFunc int epicsShareAPI errlogMessage( const char *message); @@ -65,7 +65,7 @@ epicsShareFunc int epicsShareAPI errlogInit(int bufsize); epicsShareFunc void epicsShareAPI errlogFlush(void); /*other routines that write to log file*/ -epicsShareFunc void epicsShareAPIV errPrintf(long status, const char *pFileName, +epicsShareFunc void errPrintf(long status, const char *pFileName, int lineno, const char *pformat, ...); epicsShareExtern int errVerbose;