epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

libCom: actually use libComAPI.h in libCom

Browse Source
This commit is contained in:
Michael Davidsaver
2020-05-20 13:38:09 -07:00
parent b2750bbe93
commit 799e72b1e3
250 changed files with 1286 additions and 1434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/libcom/src/misc/aToIPAddr.c
View File

@@ -14,7 +14,6 @@
#include <stdio.h>
#include <string.h>
#define epicsExportSharedSymbols
#include "epicsTypes.h"
#include "osiSock.h"
@@ -75,7 +74,7 @@ static int initIPAddr ( struct in_addr ipAddr, unsigned port,
* "pAddrString" does not contain an address of the form
* "n.n.n.n:p or host:p"
*/
epicsShareFunc int epicsShareAPI
LIBCOM_API int epicsStdCall
aToIPAddr( const char *pAddrString, unsigned short defaultPort,
struct sockaddr_in *pIP )
{

3
modules/libcom/src/misc/adjustment.c
View File

@@ -20,10 +20,9 @@
* After setting the following they will be declared as exports
* (Appropriate for what we implenment)
*/
#define epicsExportSharedSymbols
#include "adjustment.h"
epicsShareFunc size_t adjustToWorstCaseAlignment(size_t size)
LIBCOM_API size_t adjustToWorstCaseAlignment(size_t size)
{
int align_size, adjust;
struct test_long_word { char c; long lw; };

4
modules/libcom/src/misc/adjustment.h
View File

@@ -17,7 +17,7 @@
#ifndef INCadjustmenth
#define INCadjustmenth
#include "shareLib.h"
#include "libComAPI.h"
#ifdef __cplusplus
extern "C" {
@@ -26,7 +26,7 @@ extern "C" {
/** returns a value larger or equal than `size`, that is an exact
multiple of the worst case alignment for the architecture on
which the routine is executed. */
epicsShareFunc size_t adjustToWorstCaseAlignment(size_t size);
LIBCOM_API size_t adjustToWorstCaseAlignment(size_t size);
#ifdef __cplusplus
}

6
modules/libcom/src/misc/alarm.h
View File

@@ -20,7 +20,7 @@
#ifndef INC_alarm_H
#define INC_alarm_H
#include "shareLib.h"
#include "libComAPI.h"
#ifdef __cplusplus
extern "C" {
@@ -116,11 +116,11 @@ typedef enum {
/**
* \brief How to convert an alarm severity into a string
*/
epicsShareExtern const char *epicsAlarmSeverityStrings [ALARM_NSEV];
LIBCOM_API extern const char *epicsAlarmSeverityStrings [ALARM_NSEV];
/**
* \brief How to convert an alarm condition/status into a string
*/
epicsShareExtern const char *epicsAlarmConditionStrings [ALARM_NSTATUS];
LIBCOM_API extern const char *epicsAlarmConditionStrings [ALARM_NSTATUS];
#ifdef __cplusplus

5
modules/libcom/src/misc/alarmString.c
View File

@@ -9,12 +9,11 @@
/* String names for alarm status and severity values */
#define epicsExportSharedSymbols
#include "alarm.h"
/* ALARM SEVERITIES - must match menuAlarmSevr.dbd and alarm.h */
epicsShareDef const char * epicsAlarmSeverityStrings[ALARM_NSEV] = {
const char * epicsAlarmSeverityStrings[ALARM_NSEV] = {
"NO_ALARM",
"MINOR",
"MAJOR",
@@ -24,7 +23,7 @@ epicsShareDef const char * epicsAlarmSeverityStrings[ALARM_NSEV] = {
/* ALARM STATUS - must match menuAlarmStat.dbd and alarm.h */
epicsShareDef const char * epicsAlarmConditionStrings[ALARM_NSTATUS] = {
const char * epicsAlarmConditionStrings[ALARM_NSTATUS] = {
"NO_ALARM",
"READ",
"WRITE",

7
modules/libcom/src/misc/cantProceed.c
View File

@@ -14,13 +14,12 @@
#include <stdlib.h>
#include <stdarg.h>
#define epicsExportSharedSymbols
#include "errlog.h"
#include "cantProceed.h"
#include "epicsThread.h"
#include "epicsStackTrace.h"
epicsShareFunc void * callocMustSucceed(size_t count, size_t size, const char *msg)
LIBCOM_API void * callocMustSucceed(size_t count, size_t size, const char *msg)
{
void * mem = NULL;
if (count > 0 && size > 0) {
@@ -36,7 +35,7 @@ epicsShareFunc void * callocMustSucceed(size_t count, size_t size, const char *m
return mem;
}
epicsShareFunc void * mallocMustSucceed(size_t size, const char *msg)
LIBCOM_API void * mallocMustSucceed(size_t size, const char *msg)
{
void * mem = NULL;
if (size > 0) {
@@ -52,7 +51,7 @@ epicsShareFunc void * mallocMustSucceed(size_t size, const char *msg)
return mem;
}
epicsShareFunc void cantProceed(const char *msg, ...)
LIBCOM_API void cantProceed(const char *msg, ...)
{
va_list pvar;
va_start(pvar, msg);

8
modules/libcom/src/misc/cantProceed.h
View File

@@ -27,7 +27,7 @@
#include <stdlib.h>
#include "compilerDependencies.h"
#include "shareLib.h"
#include "libComAPI.h"
#ifdef __cplusplus
extern "C" {
@@ -42,7 +42,7 @@ extern "C" {
* \param errorMessage A printf-style error message describing the error.
* \param ... Any parameters required for the error message.
*/
epicsShareFunc void cantProceed(const char *errorMessage, ...)
LIBCOM_API void cantProceed(const char *errorMessage, ...)
EPICS_PRINTF_STYLE(1,2);
/** \name Memory Allocation Functions
@@ -60,14 +60,14 @@ epicsShareFunc void cantProceed(const char *errorMessage, ...)
* \param errorMessage What this memory is needed for.
* \return Pointer to zeroed allocated memory.
*/
epicsShareFunc void * callocMustSucceed(size_t count, size_t size,
LIBCOM_API void * callocMustSucceed(size_t count, size_t size,
const char *errorMessage);
/** \brief A malloc() that never returns NULL.
* \param size Size of block to allocate.
* \param errorMessage What this memory is needed for.
* \return Pointer to allocated memory.
*/
epicsShareFunc void * mallocMustSucceed(size_t size, const char *errorMessage);
LIBCOM_API void * mallocMustSucceed(size_t size, const char *errorMessage);
/** @} */
#ifdef __cplusplus

3
modules/libcom/src/misc/epicsConvert.c
View File

@@ -11,12 +11,11 @@
#include <float.h>
#include <limits.h>
#define epicsExportSharedSymbols
#include "epicsMath.h"
#include "epicsConvert.h"
#include "cantProceed.h"
epicsShareFunc float epicsConvertDoubleToFloat(double value)
LIBCOM_API float epicsConvertDoubleToFloat(double value)
{
double abs;

4
modules/libcom/src/misc/epicsConvert.h
View File

@@ -11,13 +11,13 @@
#ifndef INC_epicsConvert_H
#define INC_epicsConvert_H
#include <shareLib.h>
#include <libComAPI.h>
#ifdef __cplusplus
extern "C" {
#endif
epicsShareFunc float epicsConvertDoubleToFloat(double value);
LIBCOM_API float epicsConvertDoubleToFloat(double value);
#ifdef __cplusplus
}

13
modules/libcom/src/misc/epicsExit.c
View File

@@ -27,7 +27,6 @@
#include <errno.h>
#include <string.h>
#define epicsExportSharedSymbols
#include "ellLib.h"
#include "errlog.h"
#include "epicsThread.h"
@@ -100,7 +99,7 @@ static void epicsExitCallAtExitsPvt(exitPvt *pep)
}
}
epicsShareFunc void epicsExitCallAtExits(void)
LIBCOM_API void epicsExitCallAtExits(void)
{
exitPvt * pep = 0;
@@ -119,7 +118,7 @@ epicsShareFunc void epicsExitCallAtExits(void)
epicsMutexCleanup();
}
epicsShareFunc void epicsExitCallAtThreadExits(void)
LIBCOM_API void epicsExitCallAtThreadExits(void)
{
exitPvt * pep;
@@ -148,7 +147,7 @@ static int epicsAtExitPvt(exitPvt *pep, epicsExitFunc func, void *arg, const cha
return status;
}
epicsShareFunc int epicsAtThreadExit(epicsExitFunc func, void *arg)
LIBCOM_API int epicsAtThreadExit(epicsExitFunc func, void *arg)
{
exitPvt * pep;
@@ -164,7 +163,7 @@ epicsShareFunc int epicsAtThreadExit(epicsExitFunc func, void *arg)
return epicsAtExitPvt ( pep, func, arg, NULL );
}
epicsShareFunc int epicsAtExit3(epicsExitFunc func, void *arg, const char* name)
LIBCOM_API int epicsAtExit3(epicsExitFunc func, void *arg, const char* name)
{
int status = -1;
@@ -180,7 +179,7 @@ epicsShareFunc int epicsAtExit3(epicsExitFunc func, void *arg, const char* name)
return status;
}
epicsShareFunc void epicsExit(int status)
LIBCOM_API void epicsExit(int status)
{
epicsExitCallAtExits();
epicsThreadSleep(0.1);
@@ -202,7 +201,7 @@ static void exitLaterOnceFunc(void *raw)
&exitNow, NULL);
}
epicsShareFunc void epicsExitLater(int status)
LIBCOM_API void epicsExitLater(int status)
{
epicsThreadOnce(&exitLaterOnce, &exitLaterOnceFunc, &status);
}

14
modules/libcom/src/misc/epicsExit.h
View File

@@ -21,7 +21,7 @@
#ifndef epicsExith
#define epicsExith
#include <shareLib.h>
#include <libComAPI.h>
#ifdef __cplusplus
extern "C" {
@@ -37,14 +37,14 @@ typedef void (*epicsExitFunc)(void *arg);
* \brief Calls epicsExitCallAtExits(), then the OS exit() routine.
* \param status Passed to exit()
*/
epicsShareFunc void epicsExit(int status);
LIBCOM_API void epicsExit(int status);
/**
* \brief Arrange to call epicsExit() later from a low priority thread.
*
* This delays the actual call to exit() so it doesn't run in this thread.
* \param status Passed to exit()
*/
epicsShareFunc void epicsExitLater(int status);
LIBCOM_API void epicsExitLater(int status);
/**
* \brief Internal routine that runs the registered exit routines.
*
@@ -52,14 +52,14 @@ epicsShareFunc void epicsExitLater(int status);
* in reverse order of their registration.
* \note Most applications will not call this routine directly.
*/
epicsShareFunc void epicsExitCallAtExits(void);
LIBCOM_API void epicsExitCallAtExits(void);
/**
* \brief Register a function and an associated context parameter
* \param func Function to be called when epicsExitCallAtExits is invoked.
* \param arg Context parameter for the function.
* \param name Function name
*/
epicsShareFunc int epicsAtExit3(epicsExitFunc func, void *arg, const char* name);
LIBCOM_API int epicsAtExit3(epicsExitFunc func, void *arg, const char* name);
/**
* \brief Convenience macro to register a function and context value to be
@@ -77,14 +77,14 @@ epicsShareFunc int epicsAtExit3(epicsExitFunc func, void *arg, const char* name)
* entry routine returns. It will not be run if the thread gets stopped by
* some other method.
*/
epicsShareFunc void epicsExitCallAtThreadExits(void);
LIBCOM_API void epicsExitCallAtThreadExits(void);
/**
* \brief Register a function and an context value to be run by this thread
* when it returns from its entry routine.
* \param func Function be called at thread completion.
* \param arg Context parameter for the function.
*/
epicsShareFunc int epicsAtThreadExit(epicsExitFunc func, void *arg);
LIBCOM_API int epicsAtThreadExit(epicsExitFunc func, void *arg);
#ifdef __cplusplus

33
modules/libcom/src/misc/epicsStdlib.c
View File

@@ -13,7 +13,6 @@
#include <errno.h>
#include <float.h>
#define epicsExportSharedSymbols
#include "epicsMath.h"
#include "epicsStdlib.h"
#include "epicsString.h"
@@ -22,7 +21,7 @@
/* These are the conversion primitives */
epicsShareFunc int
LIBCOM_API int
epicsParseLong(const char *str, long *to, int base, char **units)
{
int c;
@@ -53,7 +52,7 @@ epicsParseLong(const char *str, long *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseULong(const char *str, unsigned long *to, int base, char **units)
{
int c;
@@ -84,7 +83,7 @@ epicsParseULong(const char *str, unsigned long *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseLLong(const char *str, long long *to, int base, char **units)
{
int c;
@@ -115,7 +114,7 @@ epicsParseLLong(const char *str, long long *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseULLong(const char *str, unsigned long long *to, int base, char **units)
{
int c;
@@ -146,7 +145,7 @@ epicsParseULLong(const char *str, unsigned long long *to, int base, char **units
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseDouble(const char *str, double *to, char **units)
{
int c;
@@ -178,7 +177,7 @@ epicsParseDouble(const char *str, double *to, char **units)
/* These call the primitives */
epicsShareFunc int
LIBCOM_API int
epicsParseInt8(const char *str, epicsInt8 *to, int base, char **units)
{
long value;
@@ -194,7 +193,7 @@ epicsParseInt8(const char *str, epicsInt8 *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseUInt8(const char *str, epicsUInt8 *to, int base, char **units)
{
unsigned long value;
@@ -210,7 +209,7 @@ epicsParseUInt8(const char *str, epicsUInt8 *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseInt16(const char *str, epicsInt16 *to, int base, char **units)
{
long value;
@@ -226,7 +225,7 @@ epicsParseInt16(const char *str, epicsInt16 *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseUInt16(const char *str, epicsUInt16 *to, int base, char **units)
{
unsigned long value;
@@ -242,7 +241,7 @@ epicsParseUInt16(const char *str, epicsUInt16 *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseInt32(const char *str, epicsInt32 *to, int base, char **units)
{
long value;
@@ -260,7 +259,7 @@ epicsParseInt32(const char *str, epicsInt32 *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseUInt32(const char *str, epicsUInt32 *to, int base, char **units)
{
unsigned long value;
@@ -278,7 +277,7 @@ epicsParseUInt32(const char *str, epicsUInt32 *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseInt64(const char *str, epicsInt64 *to, int base, char **units)
{
#if (LONG_MAX == 0x7fffffffffffffffLL)
@@ -296,7 +295,7 @@ epicsParseInt64(const char *str, epicsInt64 *to, int base, char **units)
return 0;
}
epicsShareFunc int
LIBCOM_API int
epicsParseUInt64(const char *str, epicsUInt64 *to, int base, char **units)
{
#if (ULONG_MAX == 0xffffffffffffffffULL)
@@ -315,7 +314,7 @@ epicsParseUInt64(const char *str, epicsUInt64 *to, int base, char **units)
}
epicsShareFunc int
LIBCOM_API int
epicsParseFloat(const char *str, float *to, char **units)
{
double value, abs;
@@ -339,11 +338,11 @@ epicsParseFloat(const char *str, float *to, char **units)
* #define epicsStrtod strtod
*
* If strtod() is broken, osdStrtod.h defines this prototype:
* epicsShareFunc double epicsStrtod(const char *str, char **endp);
* LIBCOM_API double epicsStrtod(const char *str, char **endp);
*/
#ifndef epicsStrtod
epicsShareFunc double
LIBCOM_API double
epicsStrtod(const char *str, char **endp)
{
const char *cp = str;

30
modules/libcom/src/misc/epicsStdlib.h
View File

@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <limits.h>
#include "shareLib.h"
#include "libComAPI.h"
#include "osdStrtod.h"
#include "epicsTypes.h"
#include "errMdef.h"
@@ -31,37 +31,37 @@ extern "C" {
#define S_stdlib_badBase (M_stdlib | 5) /* Number base not supported */
epicsShareFunc int
LIBCOM_API int
epicsParseLong(const char *str, long *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseULong(const char *str, unsigned long *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseLLong(const char *str, long long *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseULLong(const char *str, unsigned long long *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseDouble(const char *str, double *to, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseFloat(const char *str, float *to, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseInt8(const char *str, epicsInt8 *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseUInt8(const char *str, epicsUInt8 *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseInt16(const char *str, epicsInt16 *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseUInt16(const char *str, epicsUInt16 *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseInt32(const char *str, epicsInt32 *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseUInt32(const char *str, epicsUInt32 *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseInt64(const char *str, epicsInt64 *to, int base, char **units);
epicsShareFunc int
LIBCOM_API int
epicsParseUInt64(const char *str, epicsUInt64 *to, int base, char **units);
#define epicsParseFloat32(str, to, units) epicsParseFloat(str, to, units)

1
modules/libcom/src/misc/epicsString.c
View File

@@ -22,7 +22,6 @@
#include <errno.h>
#include <ctype.h>
#define epicsExportSharedSymbols
#include "epicsStdio.h"
#include "cantProceed.h"
#include "epicsString.h"

30
modules/libcom/src/misc/epicsString.h
View File

@@ -17,32 +17,32 @@
#include <stdio.h>
#include "epicsTypes.h"
#include "shareLib.h"
#include "libComAPI.h"
#ifdef __cplusplus
extern "C" {
#endif
epicsShareFunc int epicsStrnRawFromEscaped(char *outbuf, size_t outsize,
LIBCOM_API int epicsStrnRawFromEscaped(char *outbuf, size_t outsize,
const char *inbuf, size_t inlen);
epicsShareFunc int epicsStrnEscapedFromRaw(char *outbuf, size_t outsize,
LIBCOM_API int epicsStrnEscapedFromRaw(char *outbuf, size_t outsize,
const char *inbuf, size_t inlen);
epicsShareFunc size_t epicsStrnEscapedFromRawSize(const char *buf, size_t len);
epicsShareFunc int epicsStrCaseCmp(const char *s1, const char *s2);
epicsShareFunc int epicsStrnCaseCmp(const char *s1, const char *s2, size_t len);
epicsShareFunc char * epicsStrDup(const char *s);
epicsShareFunc char * epicsStrnDup(const char *s, size_t len);
epicsShareFunc int epicsStrPrintEscaped(FILE *fp, const char *s, size_t n);
LIBCOM_API size_t epicsStrnEscapedFromRawSize(const char *buf, size_t len);
LIBCOM_API int epicsStrCaseCmp(const char *s1, const char *s2);
LIBCOM_API int epicsStrnCaseCmp(const char *s1, const char *s2, size_t len);
LIBCOM_API char * epicsStrDup(const char *s);
LIBCOM_API char * epicsStrnDup(const char *s, size_t len);
LIBCOM_API int epicsStrPrintEscaped(FILE *fp, const char *s, size_t n);
#define epicsStrSnPrintEscaped epicsStrnEscapedFromRaw
epicsShareFunc size_t epicsStrnLen(const char *s, size_t maxlen);
epicsShareFunc int epicsStrGlobMatch(const char *str, const char *pattern);
epicsShareFunc char * epicsStrtok_r(char *s, const char *delim, char **lasts);
epicsShareFunc unsigned int epicsStrHash(const char *str, unsigned int seed);
epicsShareFunc unsigned int epicsMemHash(const char *str, size_t length,
LIBCOM_API size_t epicsStrnLen(const char *s, size_t maxlen);
LIBCOM_API int epicsStrGlobMatch(const char *str, const char *pattern);
LIBCOM_API char * epicsStrtok_r(char *s, const char *delim, char **lasts);
LIBCOM_API unsigned int epicsStrHash(const char *str, unsigned int seed);
LIBCOM_API unsigned int epicsMemHash(const char *str, size_t length,
unsigned int seed);
/* dbTranslateEscape is deprecated, use epicsStrnRawFromEscaped instead */
epicsShareFunc int dbTranslateEscape(char *s, const char *ct);
LIBCOM_API int dbTranslateEscape(char *s, const char *ct);
#ifdef __cplusplus
}

22
modules/libcom/src/misc/epicsTypes.h
View File

@@ -15,7 +15,7 @@
#ifndef INC_epicsTypes_H
#define INC_epicsTypes_H
#include "shareLib.h"
#include "libComAPI.h"
#include "compilerDependencies.h"
#ifndef stringOf
@@ -120,7 +120,7 @@ typedef enum {
* of type name strings.
*/
#ifdef epicsTypesGLOBAL
epicsShareDef const char *epicsTypeNames [lastEpicsType+1] = {
const char *epicsTypeNames [lastEpicsType+1] = {
"epicsInt8",
"epicsUInt8",
"epicsInt16",
@@ -134,7 +134,7 @@ epicsShareDef const char *epicsTypeNames [lastEpicsType+1] = {
"epicsOldString",
};
#else /* epicsTypesGLOBAL */
epicsShareExtern const char *epicsTypeNames [lastEpicsType+1];
LIBCOM_API extern const char *epicsTypeNames [lastEpicsType+1];
#endif /* epicsTypesGLOBAL */
/*
@@ -142,7 +142,7 @@ epicsShareExtern const char *epicsTypeNames [lastEpicsType+1];
* of type code name strings.
*/
#ifdef epicsTypesGLOBAL
epicsShareDef const char *epicsTypeCodeNames [lastEpicsType+1] = {
const char *epicsTypeCodeNames [lastEpicsType+1] = {
"epicsInt8T",
"epicsUInt8T",
"epicsInt16T",
@@ -156,11 +156,11 @@ epicsShareDef const char *epicsTypeCodeNames [lastEpicsType+1] = {
"epicsOldStringT",
};
#else /* epicsTypesGLOBAL */
epicsShareExtern const char *epicsTypeCodeNames [lastEpicsType+1];
LIBCOM_API extern const char *epicsTypeCodeNames [lastEpicsType+1];
#endif /* epicsTypesGLOBAL */
#ifdef epicsTypesGLOBAL
epicsShareDef const unsigned epicsTypeSizes [lastEpicsType+1] = {
const unsigned epicsTypeSizes [lastEpicsType+1] = {
sizeof (epicsInt8),
sizeof (epicsUInt8),
sizeof (epicsInt16),
@@ -174,7 +174,7 @@ epicsShareDef const unsigned epicsTypeSizes [lastEpicsType+1] = {
sizeof (epicsOldString),
};
#else /* epicsTypesGLOBAL */
epicsShareExtern const unsigned epicsTypeSizes [lastEpicsType+1];
LIBCOM_API extern const unsigned epicsTypeSizes [lastEpicsType+1];
#endif /* epicsTypesGLOBAL */
/*
@@ -191,7 +191,7 @@ typedef enum {
} epicsTypeClass;
#ifdef epicsTypesGLOBAL
epicsShareDef const epicsTypeClass epicsTypeClasses [lastEpicsType+1] = {
const epicsTypeClass epicsTypeClasses [lastEpicsType+1] = {
epicsIntC,
epicsUIntC,
epicsIntC,
@@ -205,12 +205,12 @@ epicsShareDef const epicsTypeClass epicsTypeClasses [lastEpicsType+1] = {
epicsOldStringC
};
#else /* epicsTypesGLOBAL */
epicsShareExtern const epicsTypeClass epicsTypeClasses [lastEpicsType+1];
LIBCOM_API extern const epicsTypeClass epicsTypeClasses [lastEpicsType+1];
#endif /* epicsTypesGLOBAL */
#ifdef epicsTypesGLOBAL
epicsShareDef const char *epicsTypeAnyFieldName [lastEpicsType+1] = {
const char *epicsTypeAnyFieldName [lastEpicsType+1] = {
"int8",
"uInt8",
"int16",
@@ -224,7 +224,7 @@ epicsShareDef const char *epicsTypeAnyFieldName [lastEpicsType+1] = {
"", /* Old Style Strings will not be in epicsAny type */
};
#else /* epicsTypesGLOBAL */
epicsShareExtern const char *epicsTypeAnyFieldName [lastEpicsType+1];
LIBCOM_API extern const char *epicsTypeAnyFieldName [lastEpicsType+1];
#endif /* epicsTypesGLOBAL */
#endif /* INC_epicsTypes_H */

1
modules/libcom/src/misc/epicsUnitTest.c
View File

@@ -21,7 +21,6 @@
# include <crtdbg.h>
#endif
#define epicsExportSharedSymbols
#include "epicsThread.h"
#include "epicsMutex.h"
#include "epicsUnitTest.h"

32
modules/libcom/src/misc/epicsUnitTest.h
View File

@@ -149,7 +149,7 @@ ok 3 - M_PI == 4.0*atan(1.0)
#include <stdarg.h>
#include "compilerDependencies.h"
#include "shareLib.h"
#include "libComAPI.h"
#ifdef __cplusplus
extern "C" {
@@ -159,7 +159,7 @@ extern "C" {
* \param tests Number of tests to be run. May be zero if not known but the
* test harness then can't tell if the program dies prematurely.
*/
epicsShareFunc void testPlan(int tests);
LIBCOM_API void testPlan(int tests);
/** \name Announcing Test Results
* Routines that declare individual test results.
@@ -171,7 +171,7 @@ epicsShareFunc void testPlan(int tests);
* \param ... Any parameters required for the format string.
* \return The value of \p pass.
*/
epicsShareFunc int testOk(int pass, const char *fmt, ...)
LIBCOM_API int testOk(int pass, const char *fmt, ...)
EPICS_PRINTF_STYLE(2, 3);
/** \brief Test result using condition as description
* \param cond Condition to be evaluated and displayed.
@@ -184,19 +184,19 @@ epicsShareFunc int testOk(int pass, const char *fmt, ...)
* \param pvar A var-args pointer to any parameters for the format string.
* \return The value of \p pass.
*/
epicsShareFunc int testOkV(int pass, const char *fmt, va_list pvar);
LIBCOM_API int testOkV(int pass, const char *fmt, va_list pvar);
/** \brief Passing test result with printf-style description.
* \param fmt A printf-style format string describing the test.
* \param ... Any parameters required for the format string.
* \return The value of \p pass.
*/
epicsShareFunc void testPass(const char *fmt, ...)
LIBCOM_API void testPass(const char *fmt, ...)
EPICS_PRINTF_STYLE(1, 2);
/** \brief Failing test result with printf-style description.
* \param fmt A printf-style format string describing the test.
* \param ... Any parameters required for the format string.
*/
epicsShareFunc void testFail(const char *fmt, ...)
LIBCOM_API void testFail(const char *fmt, ...)
EPICS_PRINTF_STYLE(1, 2);
/** @} */
@@ -209,19 +209,19 @@ epicsShareFunc void testFail(const char *fmt, ...)
* \param skip How many tests are being skipped.
* \param why Reason for skipping these tests.
*/
epicsShareFunc void testSkip(int skip, const char *why);
LIBCOM_API void testSkip(int skip, const char *why);
/** \brief Mark the start of a group of tests that are expected to fail
* \param why Reason for expected failures.
*/
epicsShareFunc void testTodoBegin(const char *why);
LIBCOM_API void testTodoBegin(const char *why);
/** \brief Mark the end of a failing test group.
*/
epicsShareFunc void testTodoEnd(void);
LIBCOM_API void testTodoEnd(void);
/** \brief Stop testing, program cannot continue.
* \param fmt A printf-style format string giving the reason for stopping.
* \param ... Any parameters required for the format string.
*/
epicsShareFunc void testAbort(const char *fmt, ...)
LIBCOM_API void testAbort(const char *fmt, ...)
EPICS_PRINTF_STYLE(1, 2);
/** @} */
@@ -229,13 +229,13 @@ epicsShareFunc void testAbort(const char *fmt, ...)
* \param fmt A printf-style format string containing diagnostic information.
* \param ... Any parameters required for the format string.
*/
epicsShareFunc int testDiag(const char *fmt, ...)
LIBCOM_API int testDiag(const char *fmt, ...)
EPICS_PRINTF_STYLE(1, 2);
/** \brief Mark the end of testing.
*/
epicsShareFunc int testDone(void);
LIBCOM_API int testDone(void);
epicsShareFunc
LIBCOM_API
int testImpreciseTiming(void);
/** \name Test Harness for Embedded OSs
@@ -248,9 +248,9 @@ int testImpreciseTiming(void);
typedef int (*TESTFUNC)(void);
/** \brief Initialize test harness
*/
epicsShareFunc void testHarness(void);
epicsShareFunc void testHarnessExit(void *dummy);
epicsShareFunc void runTestFunc(const char *name, TESTFUNC func);
LIBCOM_API void testHarness(void);
LIBCOM_API void testHarnessExit(void *dummy);
LIBCOM_API void runTestFunc(const char *name, TESTFUNC func);
/** \brief Run a test program
* \param func Name of the test program.

1
modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp
View File

@@ -21,7 +21,6 @@
//#define EPICS_FREELIST_DEBUG
#define EPICS_PRIVATE_API
#define epicsExportSharedSymbols
#include "ipAddrToAsciiAsynchronous.h"
#include "epicsThread.h"
#include "epicsMutex.h"

8
modules/libcom/src/misc/ipAddrToAsciiAsynchronous.h
View File

@@ -17,16 +17,16 @@
#define ipAddrToAsciiAsynchronous_h
#include "osiSock.h"
#include "shareLib.h"
#include "libComAPI.h"
class epicsShareClass ipAddrToAsciiCallBack {
class LIBCOM_API ipAddrToAsciiCallBack {
public:
virtual void transactionComplete ( const char * pHostName ) = 0;
virtual void show ( unsigned level ) const;
virtual ~ipAddrToAsciiCallBack () = 0;
};
class epicsShareClass ipAddrToAsciiTransaction {
class LIBCOM_API ipAddrToAsciiTransaction {
public:
virtual void release () = 0;
virtual void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ) = 0;
@@ -36,7 +36,7 @@ protected:
virtual ~ipAddrToAsciiTransaction () = 0;
};
class epicsShareClass ipAddrToAsciiEngine {
class LIBCOM_API ipAddrToAsciiEngine {
public:
virtual void release () = 0;
virtual ipAddrToAsciiTransaction & createTransaction () = 0;

3
modules/libcom/src/misc/truncateFile.c
View File

@@ -14,7 +14,6 @@
#include <string.h>
#include <limits.h>
#define epicsExportSharedSymbols
#include "epicsStdio.h"
#ifndef SEEK_END
@@ -25,7 +24,7 @@
* truncate to specified size (we dont use truncate()
* because it is not portable)
*/
epicsShareFunc enum TF_RETURN truncateFile (const char *pFileName, unsigned long size)
LIBCOM_API enum TF_RETURN truncateFile (const char *pFileName, unsigned long size)
{
long filePos;
FILE *pFile;

6
modules/libcom/src/misc/unixFileName.h
View File

@@ -14,7 +14,7 @@
#ifndef unixFileNameH
#define unixFileNameH
#include <shareLib.h>
#include <libComAPI.h>
#ifdef __cplusplus
extern "C" {
@@ -26,13 +26,13 @@ extern "C" {
/** Return the absolute path of the current executable.
\return NULL or the path. Caller must free()
*/
epicsShareFunc
LIBCOM_API
char *epicsGetExecName(void);
/** Return the absolute path of the directory containing the current executable.
\return NULL or the path. Caller must free()
*/
epicsShareFunc
LIBCOM_API
char *epicsGetExecDir(void);
#ifdef __cplusplus