From 35f054e17f3496588f2b2228d526b4f4d52c18c2 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 12 May 1998 18:33:38 +0000 Subject: [PATCH] use READONLY for const so that pre-ANSI C extensions will compile --- src/libCom/bldEnvData | 9 +++++--- src/libCom/bldEnvData.pl | 6 +++--- src/libCom/env/bldEnvData.pl | 6 +++--- src/libCom/env/envDefs.h | 40 ++++++++++++++++++------------------ src/libCom/envDefs.h | 40 ++++++++++++++++++------------------ 5 files changed, 52 insertions(+), 49 deletions(-) diff --git a/src/libCom/bldEnvData b/src/libCom/bldEnvData index 8fa7b421d..9e74dca4c 100755 --- a/src/libCom/bldEnvData +++ b/src/libCom/bldEnvData @@ -7,6 +7,9 @@ # Experimental Physics and Industrial Control System (EPICS) # # $Log$ +# Revision 1.9 1997/05/01 19:57:10 jhill +# updated dll keywords +# # Revision 1.8 1997/04/10 19:46:59 jhill # new env param decl # @@ -58,7 +61,7 @@ TOOL=`basename $0` # Start by creating a list of the ENV_PARAM declarations PARAMS=`sed -n -e 's/;//' \ - -e 's/^[ ]*epicsShareExtern[ ][ ]*const[ ][ ]*ENV_PARAM[ ][ ]*//p' \ + -e 's/^[ ]*epicsShareExtern[ ][ ]*READONLY[ ][ ]*ENV_PARAM[ ][ ]*//p' \ ${SRC}` # Create a new header file @@ -104,13 +107,13 @@ do # Add this definition to the header file # echo ${ENV} = ${DEFAULT} - echo epicsShareDef const ENV_PARAM ${ENV}'={"'${ENV}'","'${DEFAULT}'"};' >>${OBJ} + echo epicsShareDef READONLY ENV_PARAM ${ENV}'={"'${ENV}'","'${DEFAULT}'"};' >>${OBJ} done # Now create an array pointing to all parameters cat >>${OBJ} <) { - if (m'epicsShareExtern[ \t]+const[ \t]+ENV_PARAM[ \t]+([A-Za-z_]+)[ \t;]*') + if (m'epicsShareExtern[ \t]+READONLY[ \t]+ENV_PARAM[ \t]+([A-Za-z_]+)[ \t;]*') { $need_var{$1} = 1; } @@ -123,14 +123,14 @@ foreach $var ( sort keys %need_var ) print "Cannot find value for $var\n"; } - printf OUT "epicsShareDef const ENV_PARAM %s = { \"%s\", \"%s\" };\n", + printf OUT "epicsShareDef READONLY ENV_PARAM %s = { \"%s\", \"%s\" };\n", $var, $var, $default; } # Now create an array pointing to all parameters print OUT "\n"; -print OUT "epicsShareDef const ENV_PARAM* env_param_list[EPICS_ENV_VARIABLE_COUNT+1] =\n"; +print OUT "epicsShareDef READONLY ENV_PARAM* env_param_list[EPICS_ENV_VARIABLE_COUNT+1] =\n"; print OUT "{\n"; # Contents are the addresses of each parameter diff --git a/src/libCom/env/bldEnvData.pl b/src/libCom/env/bldEnvData.pl index 65794f7d9..6e09c429f 100644 --- a/src/libCom/env/bldEnvData.pl +++ b/src/libCom/env/bldEnvData.pl @@ -40,7 +40,7 @@ $tool=~ s'.*/''; open SRC or die "Cannot open $SRC"; while () { - if (m'epicsShareExtern[ \t]+const[ \t]+ENV_PARAM[ \t]+([A-Za-z_]+)[ \t;]*') + if (m'epicsShareExtern[ \t]+READONLY[ \t]+ENV_PARAM[ \t]+([A-Za-z_]+)[ \t;]*') { $need_var{$1} = 1; } @@ -123,14 +123,14 @@ foreach $var ( sort keys %need_var ) print "Cannot find value for $var\n"; } - printf OUT "epicsShareDef const ENV_PARAM %s = { \"%s\", \"%s\" };\n", + printf OUT "epicsShareDef READONLY ENV_PARAM %s = { \"%s\", \"%s\" };\n", $var, $var, $default; } # Now create an array pointing to all parameters print OUT "\n"; -print OUT "epicsShareDef const ENV_PARAM* env_param_list[EPICS_ENV_VARIABLE_COUNT+1] =\n"; +print OUT "epicsShareDef READONLY ENV_PARAM* env_param_list[EPICS_ENV_VARIABLE_COUNT+1] =\n"; print OUT "{\n"; # Contents are the addresses of each parameter diff --git a/src/libCom/env/envDefs.h b/src/libCom/env/envDefs.h index 5a8d63c31..6c996757c 100644 --- a/src/libCom/env/envDefs.h +++ b/src/libCom/env/envDefs.h @@ -73,26 +73,26 @@ typedef struct envParam { } ENV_PARAM; /* - * bldEnvData looks for "epicsShareExtern const ENV_PARAM" + * bldEnvData looks for "epicsShareExtern READONLY ENV_PARAM" */ -epicsShareExtern const ENV_PARAM EPICS_CA_ADDR_LIST; -epicsShareExtern const ENV_PARAM EPICS_CA_CONN_TMO; -epicsShareExtern const ENV_PARAM EPICS_CA_BEACON_PERIOD; -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_CAS_INTF_ADDR_LIST; -epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_ADDR_LIST; -epicsShareExtern const ENV_PARAM EPICS_CAS_SERVER_PORT; -epicsShareExtern const ENV_PARAM EPICS_TS_MIN_WEST; -epicsShareExtern const ENV_PARAM EPICS_TS_NTP_INET; -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 EPICS_CMD_PROTO_PORT; -epicsShareExtern const ENV_PARAM EPICS_AR_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_ADDR_LIST; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_CONN_TMO; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_BEACON_PERIOD; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_AUTO_ADDR_LIST; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_REPEATER_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_SERVER_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_CAS_INTF_ADDR_LIST; +epicsShareExtern READONLY ENV_PARAM EPICS_CAS_BEACON_ADDR_LIST; +epicsShareExtern READONLY ENV_PARAM EPICS_CAS_SERVER_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_TS_MIN_WEST; +epicsShareExtern READONLY ENV_PARAM EPICS_TS_NTP_INET; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_INET; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_FILE_LIMIT; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_FILE_NAME; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_FILE_COMMAND; +epicsShareExtern READONLY ENV_PARAM EPICS_CMD_PROTO_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_AR_PORT; #define EPICS_ENV_VARIABLE_COUNT 18 /* @@ -102,7 +102,7 @@ epicsShareExtern const ENV_PARAM EPICS_AR_PORT; * bldEnvData looks for "epicsShareExtern ENV_PARAM" so * this always needs to be divided into two lines */ -epicsShareExtern const ENV_PARAM +epicsShareExtern READONLY ENV_PARAM *env_param_list[EPICS_ENV_VARIABLE_COUNT+1]; #if defined(__STDC__) || defined(__cplusplus) diff --git a/src/libCom/envDefs.h b/src/libCom/envDefs.h index 5a8d63c31..6c996757c 100644 --- a/src/libCom/envDefs.h +++ b/src/libCom/envDefs.h @@ -73,26 +73,26 @@ typedef struct envParam { } ENV_PARAM; /* - * bldEnvData looks for "epicsShareExtern const ENV_PARAM" + * bldEnvData looks for "epicsShareExtern READONLY ENV_PARAM" */ -epicsShareExtern const ENV_PARAM EPICS_CA_ADDR_LIST; -epicsShareExtern const ENV_PARAM EPICS_CA_CONN_TMO; -epicsShareExtern const ENV_PARAM EPICS_CA_BEACON_PERIOD; -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_CAS_INTF_ADDR_LIST; -epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_ADDR_LIST; -epicsShareExtern const ENV_PARAM EPICS_CAS_SERVER_PORT; -epicsShareExtern const ENV_PARAM EPICS_TS_MIN_WEST; -epicsShareExtern const ENV_PARAM EPICS_TS_NTP_INET; -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 EPICS_CMD_PROTO_PORT; -epicsShareExtern const ENV_PARAM EPICS_AR_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_ADDR_LIST; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_CONN_TMO; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_BEACON_PERIOD; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_AUTO_ADDR_LIST; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_REPEATER_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_CA_SERVER_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_CAS_INTF_ADDR_LIST; +epicsShareExtern READONLY ENV_PARAM EPICS_CAS_BEACON_ADDR_LIST; +epicsShareExtern READONLY ENV_PARAM EPICS_CAS_SERVER_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_TS_MIN_WEST; +epicsShareExtern READONLY ENV_PARAM EPICS_TS_NTP_INET; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_INET; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_FILE_LIMIT; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_FILE_NAME; +epicsShareExtern READONLY ENV_PARAM EPICS_IOC_LOG_FILE_COMMAND; +epicsShareExtern READONLY ENV_PARAM EPICS_CMD_PROTO_PORT; +epicsShareExtern READONLY ENV_PARAM EPICS_AR_PORT; #define EPICS_ENV_VARIABLE_COUNT 18 /* @@ -102,7 +102,7 @@ epicsShareExtern const ENV_PARAM EPICS_AR_PORT; * bldEnvData looks for "epicsShareExtern ENV_PARAM" so * this always needs to be divided into two lines */ -epicsShareExtern const ENV_PARAM +epicsShareExtern READONLY ENV_PARAM *env_param_list[EPICS_ENV_VARIABLE_COUNT+1]; #if defined(__STDC__) || defined(__cplusplus)