epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

(M. Davidsaver): static keyword is part of C89,

Browse Source 
remove all uses and internal definitions of LOCAL macro
This commit is contained in:
Andrew Johnson
2009-07-09 16:37:24 +00:00
parent d7d0531394
commit 4e0ab97038
18 changed files with 157 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/logClient/iocLog.c
+3 -7
View File
@@ -22,22 +22,18 @@
#include "logClient.h"
#include "iocLog.h"
#ifndef LOCAL
#define LOCAL static
#endif
int iocLogDisable = 0;
static const int iocLogSuccess = 0;
static const int iocLogError = -1;
LOCAL logClientId iocLogClient;
static logClientId iocLogClient;
/*
* getConfig()
* Get Server Configuration
*/
LOCAL int getConfig (struct in_addr *pserver_addr, unsigned short *pserver_port)
static int getConfig (struct in_addr *pserver_addr, unsigned short *pserver_port)
{
long status;
long epics_port;
@@ -82,7 +78,7 @@ void epicsShareAPI epicsShareAPI iocLogFlush (void)
/*
* iocLogClientInit()
*/
LOCAL logClientId iocLogClientInit (void)
static logClientId iocLogClientInit (void)
{
int status;
logClientId id;
src/libCom/logClient/logClient.c
+8 -12
View File
@@ -34,10 +34,6 @@
#include "logClient.h"
#ifndef LOCAL
#define LOCAL static
#endif
static const int logClientSuccess = 0;
static const int logClientError = -1;
@@ -57,14 +53,14 @@ typedef struct {
int connFailStatus;
} logClient;
LOCAL const double LOG_RESTART_DELAY = 5.0; /* sec */
LOCAL const double LOG_SERVER_CREATE_CONNECT_SYNC_TIMEOUT = 5.0; /* sec */
LOCAL const double LOG_SERVER_SHUTDOWN_TIMEOUT = 30.0; /* sec */
static const double LOG_RESTART_DELAY = 5.0; /* sec */
static const double LOG_SERVER_CREATE_CONNECT_SYNC_TIMEOUT = 5.0; /* sec */
static const double LOG_SERVER_SHUTDOWN_TIMEOUT = 30.0; /* sec */
/*
* logClientClose ()
*/
LOCAL void logClientClose ( logClient *pClient )
static void logClientClose ( logClient *pClient )
{
# ifdef DEBUG
fprintf (stderr, "log client: lingering for connection close...");
@@ -101,7 +97,7 @@ LOCAL void logClientClose ( logClient *pClient )
/*
* logClientDestroy
*/
LOCAL void logClientDestroy (logClientId id)
static void logClientDestroy (logClientId id)
{
enum epicsSocketSystemCallInterruptMechanismQueryInfo interruptInfo;
logClient *pClient = (logClient *) id;
@@ -286,7 +282,7 @@ void epicsShareAPI logClientFlush ( logClientId id )
/*
* logClientMakeSock ()
*/
LOCAL void logClientMakeSock (logClient *pClient)
static void logClientMakeSock (logClient *pClient)
{
# ifdef DEBUG
@@ -318,7 +314,7 @@ LOCAL void logClientMakeSock (logClient *pClient)
/*
* logClientConnect()
*/
LOCAL void logClientConnect (logClient *pClient)
static void logClientConnect (logClient *pClient)
{
osiSockIoctl_t optval;
int errnoCpy;
@@ -430,7 +426,7 @@ LOCAL void logClientConnect (logClient *pClient)
/*
* logClientRestart ()
*/
LOCAL void logClientRestart ( logClientId id )
static void logClientRestart ( logClientId id )
{
logClient *pClient = (logClient *)id;