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 14:47:51 -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
modules/libcom/src/env/bldEnvData.pl
Vendored
+3 -3
View File
@@ -44,7 +44,7 @@ open SRC, '<', $env_defs
my @vars;
while (<SRC>) {
if (m/epicsShareExtern\s+const\s+ENV_PARAM\s+([A-Za-z_]\w*)\s*;/) {
if (m/LIBCOM_API\s+extern\s+const\s+ENV_PARAM\s+([A-Za-z_]\w*)\s*;/) {
push @vars, $1;
}
}
@@ -113,14 +113,14 @@ foreach my $var (@vars) {
$default = '';
}
print OUT "epicsShareDef const ENV_PARAM $var =\n",
print OUT "const ENV_PARAM $var =\n",
" {\"$var\", \"$default\"};\n";
}
# Also provide a list of all defined parameters
#
print OUT "\n",
"epicsShareDef const ENV_PARAM* env_param_list[] = {\n",
"const ENV_PARAM* env_param_list[] = {\n",
wrap(' ', ' ', join(', ', map("&$_", @vars), 'NULL')),
"\n};\n";
close OUT;
modules/libcom/src/env/envDefs.h
Vendored
+47 -47
View File
@@ -23,7 +23,7 @@
* own use--the only caveat is that such parameters aren't automatically
* setup by EPICS.
*
* \note bldEnvData.pl looks for "epicsShareExtern const ENV_PARAM <name>;"
* \note bldEnvData.pl looks for "LIBCOM_API extern const ENV_PARAM <name>;"
*/
#ifndef envDefsH
@@ -33,7 +33,7 @@
extern "C" {
#endif
#include "shareLib.h"
#include "libComAPI.h"
/**
* \brief A structure to hold a single environment parameter
@@ -43,39 +43,39 @@ typedef struct envParam {
char *pdflt; /**< \brief Default value */
} ENV_PARAM;
epicsShareExtern const ENV_PARAM EPICS_CA_ADDR_LIST;
epicsShareExtern const ENV_PARAM EPICS_CA_CONN_TMO;
epicsShareExtern const ENV_PARAM EPICS_CA_AUTO_ADDR_LIST;
epicsShareExtern const ENV_PARAM EPICS_CA_REPEATER_PORT;
epicsShareExtern const ENV_PARAM EPICS_CA_SERVER_PORT;
epicsShareExtern const ENV_PARAM EPICS_CA_MAX_ARRAY_BYTES;
epicsShareExtern const ENV_PARAM EPICS_CA_AUTO_ARRAY_BYTES;
epicsShareExtern const ENV_PARAM EPICS_CA_MAX_SEARCH_PERIOD;
epicsShareExtern const ENV_PARAM EPICS_CA_NAME_SERVERS;
epicsShareExtern const ENV_PARAM EPICS_CA_MCAST_TTL;
epicsShareExtern const ENV_PARAM EPICS_CAS_INTF_ADDR_LIST;
epicsShareExtern const ENV_PARAM EPICS_CAS_IGNORE_ADDR_LIST;
epicsShareExtern const ENV_PARAM EPICS_CAS_AUTO_BEACON_ADDR_LIST;
epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_ADDR_LIST;
epicsShareExtern const ENV_PARAM EPICS_CAS_SERVER_PORT;
epicsShareExtern const ENV_PARAM EPICS_CA_BEACON_PERIOD; /**< \brief deprecated */
epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_PERIOD;
epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_PORT;
epicsShareExtern const ENV_PARAM EPICS_BUILD_COMPILER_CLASS;
epicsShareExtern const ENV_PARAM EPICS_BUILD_OS_CLASS;
epicsShareExtern const ENV_PARAM EPICS_BUILD_TARGET_ARCH;
epicsShareExtern const ENV_PARAM EPICS_TZ;
epicsShareExtern const ENV_PARAM EPICS_TS_NTP_INET;
epicsShareExtern const ENV_PARAM EPICS_IOC_IGNORE_SERVERS;
epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_PORT;
epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_INET;
epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_FILE_LIMIT;
epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_FILE_NAME;
epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_FILE_COMMAND;
epicsShareExtern const ENV_PARAM IOCSH_PS1;
epicsShareExtern const ENV_PARAM IOCSH_HISTSIZE;
epicsShareExtern const ENV_PARAM IOCSH_HISTEDIT_DISABLE;
epicsShareExtern const ENV_PARAM *env_param_list[];
LIBCOM_API extern const ENV_PARAM EPICS_CA_ADDR_LIST;
LIBCOM_API extern const ENV_PARAM EPICS_CA_CONN_TMO;
LIBCOM_API extern const ENV_PARAM EPICS_CA_AUTO_ADDR_LIST;
LIBCOM_API extern const ENV_PARAM EPICS_CA_REPEATER_PORT;
LIBCOM_API extern const ENV_PARAM EPICS_CA_SERVER_PORT;
LIBCOM_API extern const ENV_PARAM EPICS_CA_MAX_ARRAY_BYTES;
LIBCOM_API extern const ENV_PARAM EPICS_CA_AUTO_ARRAY_BYTES;
LIBCOM_API extern const ENV_PARAM EPICS_CA_MAX_SEARCH_PERIOD;
LIBCOM_API extern const ENV_PARAM EPICS_CA_NAME_SERVERS;
LIBCOM_API extern const ENV_PARAM EPICS_CA_MCAST_TTL;
LIBCOM_API extern const ENV_PARAM EPICS_CAS_INTF_ADDR_LIST;
LIBCOM_API extern const ENV_PARAM EPICS_CAS_IGNORE_ADDR_LIST;
LIBCOM_API extern const ENV_PARAM EPICS_CAS_AUTO_BEACON_ADDR_LIST;
LIBCOM_API extern const ENV_PARAM EPICS_CAS_BEACON_ADDR_LIST;
LIBCOM_API extern const ENV_PARAM EPICS_CAS_SERVER_PORT;
LIBCOM_API extern const ENV_PARAM EPICS_CA_BEACON_PERIOD; /**< \brief deprecated */
LIBCOM_API extern const ENV_PARAM EPICS_CAS_BEACON_PERIOD;
LIBCOM_API extern const ENV_PARAM EPICS_CAS_BEACON_PORT;
LIBCOM_API extern const ENV_PARAM EPICS_BUILD_COMPILER_CLASS;
LIBCOM_API extern const ENV_PARAM EPICS_BUILD_OS_CLASS;
LIBCOM_API extern const ENV_PARAM EPICS_BUILD_TARGET_ARCH;
LIBCOM_API extern const ENV_PARAM EPICS_TZ;
LIBCOM_API extern const ENV_PARAM EPICS_TS_NTP_INET;
LIBCOM_API extern const ENV_PARAM EPICS_IOC_IGNORE_SERVERS;
LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_PORT;
LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_INET;
LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_FILE_LIMIT;
LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_FILE_NAME;
LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_FILE_COMMAND;
LIBCOM_API extern const ENV_PARAM IOCSH_PS1;
LIBCOM_API extern const ENV_PARAM IOCSH_HISTSIZE;
LIBCOM_API extern const ENV_PARAM IOCSH_HISTEDIT_DISABLE;
LIBCOM_API extern const ENV_PARAM *env_param_list[];
struct in_addr;
@@ -94,7 +94,7 @@ struct in_addr;
* \return Pointer to the environment variable value string, or
* NULL if no parameter value and default value was empty.
*/
epicsShareFunc char * epicsShareAPI
LIBCOM_API char * epicsStdCall
envGetConfigParam(const ENV_PARAM *pParam, int bufDim, char *pBuf);
/**
@@ -105,7 +105,7 @@ epicsShareFunc char * epicsShareAPI
* the default value for the parameter, or NULL if those strings
* were empty or not set.
*/
epicsShareFunc const char * epicsShareAPI
LIBCOM_API const char * epicsStdCall
envGetConfigParamPtr(const ENV_PARAM *pParam);
/**
@@ -114,7 +114,7 @@ epicsShareFunc const char * epicsShareAPI
* \param pParam Pointer to config param structure.
* \return 0
*/
epicsShareFunc long epicsShareAPI
LIBCOM_API long epicsStdCall
envPrtConfigParam(const ENV_PARAM *pParam);
/**
@@ -133,7 +133,7 @@ epicsShareFunc long epicsShareAPI
* \param pAddr Pointer to struct to receive inet addr.
* \return 0, or -1 if an error is encountered
*/
epicsShareFunc long epicsShareAPI
LIBCOM_API long epicsStdCall
envGetInetAddrConfigParam(const ENV_PARAM *pParam, struct in_addr *pAddr);
/**
@@ -151,7 +151,7 @@ epicsShareFunc long epicsShareAPI
* \param pDouble Pointer to place to store value.
* \return 0, or -1 if an error is encountered
*/
epicsShareFunc long epicsShareAPI
LIBCOM_API long epicsStdCall
envGetDoubleConfigParam(const ENV_PARAM *pParam, double *pDouble);
/**
@@ -169,7 +169,7 @@ epicsShareFunc long epicsShareAPI
* \param pLong Pointer to place to store value.
* \return 0, or -1 if an error is encountered
*/
epicsShareFunc long epicsShareAPI
LIBCOM_API long epicsStdCall
envGetLongConfigParam(const ENV_PARAM *pParam, long *pLong);
/**
@@ -186,7 +186,7 @@ epicsShareFunc long epicsShareAPI
* \param defaultPort Port number to be used if environment settings invalid.
* \return Port number.
*/
epicsShareFunc unsigned short epicsShareAPI envGetInetPortConfigParam
LIBCOM_API unsigned short epicsStdCall envGetInetPortConfigParam
(const ENV_PARAM *pEnv, unsigned short defaultPort);
/**
* \brief Get value of a boolean configuration parameter.
@@ -207,7 +207,7 @@ epicsShareFunc unsigned short epicsShareAPI envGetInetPortConfigParam
* \param pBool Pointer to place to store value.
* \return 0, or -1 if an error is encountered
*/
epicsShareFunc long epicsShareAPI
LIBCOM_API long epicsStdCall
envGetBoolConfigParam(const ENV_PARAM *pParam, int *pBool);
/**
@@ -215,7 +215,7 @@ epicsShareFunc long epicsShareAPI
*
* \return 0
*/
epicsShareFunc long epicsShareAPI epicsPrtEnvParams(void);
LIBCOM_API long epicsStdCall epicsPrtEnvParams(void);
/**
* \brief Set an environment variable's value
@@ -225,18 +225,18 @@ epicsShareFunc long epicsShareAPI epicsPrtEnvParams(void);
* \param name Environment variable name.
* \param value New value for environment variable.
*/
epicsShareFunc void epicsShareAPI epicsEnvSet (const char *name, const char *value);
LIBCOM_API void epicsStdCall epicsEnvSet (const char *name, const char *value);
/**
* \brief Clear the value of an environment variable
* \param name Environment variable name.
*/
epicsShareFunc void epicsShareAPI epicsEnvUnset (const char *name);
LIBCOM_API void epicsStdCall epicsEnvUnset (const char *name);
/**
* \brief Print value of an environment variable, or all variables
*
* \param name Environment variable name, or NULL to show all.
*/
epicsShareFunc void epicsShareAPI epicsEnvShow (const char *name);
LIBCOM_API void epicsStdCall epicsEnvShow (const char *name);
#ifdef __cplusplus
}
modules/libcom/src/env/envSubr.c
Vendored
+9 -10
View File
@@ -40,7 +40,6 @@
#include <string.h>
#include <limits.h>
#define epicsExportSharedSymbols
#include "epicsStdlib.h"
#include "epicsStdio.h"
#include "epicsString.h"
@@ -79,7 +78,7 @@
* }
*
*-*/
const char * epicsShareAPI envGetConfigParamPtr(
const char * epicsStdCall envGetConfigParamPtr(
const ENV_PARAM *pParam /* I pointer to config param structure */
)
{
@@ -137,7 +136,7 @@ const ENV_PARAM *pParam /* I pointer to config param structure */
* printf("DISPLAY is %s\n", temp);
*
*-*/
char * epicsShareAPI envGetConfigParam(
char * epicsStdCall envGetConfigParam(
const ENV_PARAM *pParam,/* I pointer to config param structure */
int bufDim, /* I dimension of parameter buffer */
char *pBuf /* I pointer to parameter buffer */
@@ -189,7 +188,7 @@ char *pBuf /* I pointer to parameter buffer */
* }
*
*-*/
long epicsShareAPI envGetDoubleConfigParam(
long epicsStdCall envGetDoubleConfigParam(
const ENV_PARAM *pParam,/* I pointer to config param structure */
double *pDouble /* O pointer to place to store value */
)
@@ -244,7 +243,7 @@ double *pDouble /* O pointer to place to store value */
* }
*
*-*/
long epicsShareAPI envGetInetAddrConfigParam(
long epicsStdCall envGetInetAddrConfigParam(
const ENV_PARAM *pParam,/* I pointer to config param structure */
struct in_addr *pAddr /* O pointer to struct to receive inet addr */
)
@@ -301,7 +300,7 @@ struct in_addr *pAddr /* O pointer to struct to receive inet addr */
* }
*
*-*/
long epicsShareAPI envGetLongConfigParam(
long epicsStdCall envGetLongConfigParam(
const ENV_PARAM *pParam,/* I pointer to config param structure */
long *pLong /* O pointer to place to store value */
)
@@ -322,7 +321,7 @@ long *pLong /* O pointer to place to store value */
}
long epicsShareAPI
long epicsStdCall
envGetBoolConfigParam(const ENV_PARAM *pParam, int *pBool)
{
char text[20];
@@ -351,7 +350,7 @@ envGetBoolConfigParam(const ENV_PARAM *pParam, int *pBool)
* envPrtConfigParam(&EPICS_TS_NTP_INET);
*
*-*/
long epicsShareAPI envPrtConfigParam(
long epicsStdCall envPrtConfigParam(
const ENV_PARAM *pParam) /* pointer to config param structure */
{
const char *pVal;
@@ -381,7 +380,7 @@ const ENV_PARAM *pParam) /* pointer to config param structure */
* epicsPrtEnvParams();
*
*-*/
long epicsShareAPI
long epicsStdCall
epicsPrtEnvParams(void)
{
const ENV_PARAM **ppParam = env_param_list;
@@ -395,7 +394,7 @@ epicsPrtEnvParams(void)
/*
* envGetInetPortConfigParam ()
*/
epicsShareFunc unsigned short epicsShareAPI envGetInetPortConfigParam
LIBCOM_API unsigned short epicsStdCall envGetInetPortConfigParam
(const ENV_PARAM *pEnv, unsigned short defaultPort)
{
long longStatus;