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

Fixes for various GCC warnings.

Browse Source
This commit is contained in:
Andrew Johnson
2006-12-06 17:10:26 +00:00
parent 724a589fe1
commit 3fe19655a1
7 changed files with 72 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/callback.c
View File

@@ -77,7 +77,7 @@ static void callbackInitPvt(void *arg)
}
}
void epicsShareAPI callbackInit()
void epicsShareAPI callbackInit(void)
{
static epicsThreadOnceId callbackOnceFlag = EPICS_THREAD_ONCE_INIT;
void *arg = 0;

2
src/db/callback.h
View File

@@ -56,7 +56,7 @@ typedef void (*CALLBACKFUNC)(struct callbackPvt*);
#define callbackGetUser(USER,PCALLBACK)\
( (USER) = (void *)((CALLBACK *)(PCALLBACK))->user )
epicsShareFunc void epicsShareAPI callbackInit();
epicsShareFunc void epicsShareAPI callbackInit(void);
epicsShareFunc void epicsShareAPI callbackRequest(CALLBACK *pCallback);
epicsShareFunc void epicsShareAPI callbackRequestProcessCallback(
CALLBACK *pCallback,int Priority, void *pRec);

68
src/db/dbAccess.c
View File

@@ -57,8 +57,6 @@
#include "dbAccessDefs.h"
#include "recGbl.h"
extern long lset_stack_not_empty;
epicsShareDef struct dbBase *pdbbase = 0;
epicsShareDef volatile int interruptAccept=FALSE;
@@ -119,7 +117,7 @@ static long putSpecial(DBADDR *paddr,int pass)
return(0);
}
static void get_enum_strs(DBADDR *paddr,void **ppbuffer,
static void get_enum_strs(DBADDR *paddr, char **ppbuffer,
struct rset *prset,long *options)
{
short field_type=paddr->field_type;
@@ -179,7 +177,7 @@ choice_common:
return;
}
static void get_graphics(DBADDR *paddr,void **ppbuffer,
static void get_graphics(DBADDR *paddr, char **ppbuffer,
struct rset *prset,long *options)
{
struct dbr_grDouble grd;
@@ -219,7 +217,7 @@ static void get_graphics(DBADDR *paddr,void **ppbuffer,
return;
}
static void get_control(DBADDR *paddr,void **ppbuffer,
static void get_control(DBADDR *paddr, char **ppbuffer,
struct rset *prset,long *options)
{
struct dbr_ctrlDouble ctrld;
@@ -259,7 +257,7 @@ static void get_control(DBADDR *paddr,void **ppbuffer,
return;
}
static void get_alarm(DBADDR *paddr,void **ppbuffer,
static void get_alarm(DBADDR *paddr, char **ppbuffer,
struct rset *prset,long *options)
{
struct dbr_alDouble ald;
@@ -304,14 +302,13 @@ static void get_alarm(DBADDR *paddr,void **ppbuffer,
return;
}
static void getOptions(DBADDR *paddr,void **poriginal,long *options,void *pflin)
static void getOptions(DBADDR *paddr,char **poriginal,long *options,void *pflin)
{
db_field_log *pfl= (db_field_log *)pflin;
struct rset *prset;
short field_type=paddr->field_type;
dbCommon *pcommon;
void *pbuffer = *poriginal;
char *pbuffer = *poriginal;
prset=dbGetRset(paddr);
/* Process options */
@@ -328,19 +325,17 @@ static void getOptions(DBADDR *paddr,void **poriginal,long *options,void *pflin)
}
*pushort++ = pcommon->acks;
*pushort++ = pcommon->ackt;
pbuffer = pushort;
pbuffer = (char *)pushort;
}
if( (*options) & DBR_UNITS ) {
memset(pbuffer,'\0',dbr_units_size);
if( prset && prset->get_units ){
char * pchar = (char *)pbuffer;
(*prset->get_units)(paddr,pchar);
pchar[DB_UNITS_SIZE-1] = '\0';
(*prset->get_units)(paddr, pbuffer);
pbuffer[DB_UNITS_SIZE-1] = '\0';
} else {
*options = (*options) ^ DBR_UNITS; /*Turn off DBR_UNITS*/
*options ^= DBR_UNITS; /*Turn off DBR_UNITS*/
}
pbuffer = (char *)pbuffer + dbr_units_size;
pbuffer += dbr_units_size;
}
if( (*options) & DBR_PRECISION ) {
struct dbr_precision *pdbr_precision=
@@ -354,9 +349,9 @@ static void getOptions(DBADDR *paddr,void **poriginal,long *options,void *pflin)
pdbr_precision->field_width =
pdbr_precision->precision + 5;
} else {
*options = (*options)^DBR_PRECISION; /*Turn off DBR_PRECISION*/
*options ^= DBR_PRECISION; /*Turn off DBR_PRECISION*/
}
pbuffer = (char *)pbuffer + dbr_precision_size;
pbuffer += dbr_precision_size;
}
if( (*options) & DBR_TIME ) {
unsigned long *pulong = (unsigned long *)pbuffer;
@@ -367,16 +362,16 @@ static void getOptions(DBADDR *paddr,void **poriginal,long *options,void *pflin)
*pulong++ = pcommon->time.secPastEpoch;
*pulong++ = pcommon->time.nsec;
}
pbuffer = pulong;
pbuffer = (char *)pulong;
}
if( (*options) & DBR_ENUM_STRS )
get_enum_strs(paddr,&pbuffer,prset,options);
get_enum_strs(paddr, &pbuffer, prset, options);
if( (*options) & (DBR_GR_LONG|DBR_GR_DOUBLE ))
get_graphics(paddr,&pbuffer,prset,options);
get_graphics(paddr, &pbuffer, prset, options);
if((*options) & (DBR_CTRL_LONG | DBR_CTRL_DOUBLE ))
get_control(paddr,&pbuffer,prset,options);
get_control(paddr, &pbuffer, prset, options);
if((*options) & (DBR_AL_LONG | DBR_AL_DOUBLE ))
get_alarm(paddr,&pbuffer,prset,options);
get_alarm(paddr, &pbuffer, prset, options);
*poriginal = pbuffer;
}
@@ -921,7 +916,8 @@ long epicsShareAPI dbGetField(DBADDR *paddr,short dbrType,
status = S_db_badDbrtype;
goto done;
}
if(options && (*options))getOptions(paddr,(void **)&pbuf,options,pflin);
if (options && (*options))
getOptions(paddr, &pbuf, options, pflin);
if(nRequest && *nRequest==0) goto done;
dbInitEntry(pdbbase,&dbEntry);
status = dbFindRecord(&dbEntry,precord->name);
@@ -966,7 +962,7 @@ long epicsShareAPI dbGet(DBADDR *paddr,short dbrType,
}
prset=dbGetRset(paddr);
if(options && (*options)) {
void *pbuf = pbuffer;
char *pbuf = pbuffer;
getOptions(paddr,&pbuf,options,pflin);
pbuffer = pbuf;
@@ -1262,12 +1258,8 @@ long epicsShareAPI dbPutField(
return(status);
}
static long putAckt(paddr,pbuffer,nRequest,no_elements,offset)
DBADDR *paddr;
unsigned short *pbuffer;
long nRequest;
long no_elements;
long offset;
static long putAckt(DBADDR *paddr, const unsigned short *pbuffer, long nRequest,
long no_elements, long offset)
{
dbCommon *precord=(dbCommon *)(paddr->precord);
@@ -1282,12 +1274,8 @@ long offset;
return(0);
}
static long putAcks(paddr,pbuffer,nRequest,no_elements,offset)
DBADDR *paddr;
unsigned short *pbuffer;
long nRequest;
long no_elements;
long offset;
static long putAcks(DBADDR *paddr, const unsigned short *pbuffer, long nRequest,
long no_elements, long offset)
{
dbCommon *precord=(dbCommon *)(paddr->precord);
@@ -1316,11 +1304,9 @@ long epicsShareAPI dbPut(DBADDR *paddr,short dbrType,
if(special==SPC_ATTRIBUTE) return(S_db_noMod);
if(dbrType==DBR_PUT_ACKT && field_type<=DBF_DEVICE) {
status=putAckt(paddr,(unsigned short*)pbuffer,1l,1l,0l);
return(status);
return putAckt(paddr,(const unsigned short*)pbuffer,1l,1l,0l);
} else if(dbrType==DBR_PUT_ACKS && field_type<=DBF_DEVICE) {
status=putAcks(paddr,(unsigned short*)pbuffer,1l,1l,0l);
return(status);
return putAcks(paddr,(const unsigned short*)pbuffer,1l,1l,0l);
} else if( INVALID_DB_REQ(dbrType) || (field_type>DBF_DEVICE)) {
sprintf(message,"dbPut - database request type is %d",dbrType);
recGblDbaddrError(S_db_badDbrtype,paddr,message);

3
src/db/dbBkpt.h
View File

@@ -89,9 +89,10 @@ epicsShareFunc long epicsShareAPI dbs(const char *recordname);
epicsShareFunc long epicsShareAPI dbstat(void);
epicsShareFunc long epicsShareAPI dbp(
const char *record_name, int interest_level);
epicsShareFunc long epicsShareAPI dbap(const char *record_name);
epicsShareFunc long epicsShareAPI dbap(const char *record_name);
epicsShareFunc int epicsShareAPI dbBkpt(dbCommon *precord);
epicsShareFunc void epicsShareAPI dbPrint(dbCommon *precord);
epicsShareFunc long epicsShareAPI dbprc(char *record_name);
extern long lset_stack_not_empty;

56
src/db/db_access.c
View File

@@ -1093,121 +1093,121 @@ int no_elements
break;
case(oldDBR_STS_STRING):
status = dbPutField(paddr,DBR_STRING,
((struct dbr_sts_string *)psrc)->value,(long)no_elements);
((const struct dbr_sts_string *)psrc)->value,(long)no_elements);
break;
/* case(oldDBR_STS_INT): */
case(oldDBR_STS_SHORT):
status = dbPutField(paddr,DBR_SHORT,
&(((struct dbr_sts_short *)psrc)->value),(long)no_elements);
&(((const struct dbr_sts_short *)psrc)->value),(long)no_elements);
break;
case(oldDBR_STS_FLOAT):
status = dbPutField(paddr,DBR_FLOAT,
&(((struct dbr_sts_float *)psrc)->value),(long)no_elements);
&(((const struct dbr_sts_float *)psrc)->value),(long)no_elements);
break;
case(oldDBR_STS_ENUM):
status = dbPutField(paddr,DBR_ENUM,
&(((struct dbr_sts_enum *)psrc)->value),(long)no_elements);
&(((const struct dbr_sts_enum *)psrc)->value),(long)no_elements);
break;
case(oldDBR_STS_CHAR):
status = dbPutField(paddr,DBR_UCHAR,
&(((struct dbr_sts_char *)psrc)->value),(long)no_elements);
&(((const struct dbr_sts_char *)psrc)->value),(long)no_elements);
break;
case(oldDBR_STS_LONG):
status = dbPutField(paddr,DBR_LONG,
&(((struct dbr_sts_long *)psrc)->value),(long)no_elements);
&(((const struct dbr_sts_long *)psrc)->value),(long)no_elements);
break;
case(oldDBR_STS_DOUBLE):
status = dbPutField(paddr,DBR_DOUBLE,
&(((struct dbr_sts_double *)psrc)->value),(long)no_elements);
&(((const struct dbr_sts_double *)psrc)->value),(long)no_elements);
break;
case(oldDBR_TIME_STRING):
status = dbPutField(paddr,DBR_TIME,
((struct dbr_time_string *)psrc)->value,(long)no_elements);
((const struct dbr_time_string *)psrc)->value,(long)no_elements);
break;
/* case(oldDBR_TIME_INT): */
case(oldDBR_TIME_SHORT):
status = dbPutField(paddr,DBR_SHORT,
&(((struct dbr_time_short *)psrc)->value),(long)no_elements);
&(((const struct dbr_time_short *)psrc)->value),(long)no_elements);
break;
case(oldDBR_TIME_FLOAT):
status = dbPutField(paddr,DBR_FLOAT,
&(((struct dbr_time_float *)psrc)->value),(long)no_elements);
&(((const struct dbr_time_float *)psrc)->value),(long)no_elements);
break;
case(oldDBR_TIME_ENUM):
status = dbPutField(paddr,DBR_ENUM,
&(((struct dbr_time_enum *)psrc)->value),(long)no_elements);
&(((const struct dbr_time_enum *)psrc)->value),(long)no_elements);
break;
case(oldDBR_TIME_CHAR):
status = dbPutField(paddr,DBR_UCHAR,
&(((struct dbr_time_char *)psrc)->value),(long)no_elements);
&(((const struct dbr_time_char *)psrc)->value),(long)no_elements);
break;
case(oldDBR_TIME_LONG):
status = dbPutField(paddr,DBR_LONG,
&(((struct dbr_time_long *)psrc)->value),(long)no_elements);
&(((const struct dbr_time_long *)psrc)->value),(long)no_elements);
break;
case(oldDBR_TIME_DOUBLE):
status = dbPutField(paddr,DBR_DOUBLE,
&(((struct dbr_time_double *)psrc)->value),(long)no_elements);
&(((const struct dbr_time_double *)psrc)->value),(long)no_elements);
break;
case(oldDBR_GR_STRING):
/* no struct dbr_gr_string - use dbr_sts_string instead */
status = dbPutField(paddr,DBR_STRING,
((struct dbr_sts_string *)psrc)->value,(long)no_elements);
((const struct dbr_sts_string *)psrc)->value,(long)no_elements);
break;
/* case(oldDBR_GR_INT): */
case(oldDBR_GR_SHORT):
status = dbPutField(paddr,DBR_SHORT,
&(((struct dbr_gr_short *)psrc)->value),(long)no_elements);
&(((const struct dbr_gr_short *)psrc)->value),(long)no_elements);
break;
case(oldDBR_GR_FLOAT):
status = dbPutField(paddr,DBR_FLOAT,
&(((struct dbr_gr_float *)psrc)->value),(long)no_elements);
&(((const struct dbr_gr_float *)psrc)->value),(long)no_elements);
break;
case(oldDBR_GR_ENUM):
status = dbPutField(paddr,DBR_ENUM,
&(((struct dbr_gr_enum *)psrc)->value),(long)no_elements);
&(((const struct dbr_gr_enum *)psrc)->value),(long)no_elements);
break;
case(oldDBR_GR_CHAR):
status = dbPutField(paddr,DBR_UCHAR,
&(((struct dbr_gr_char *)psrc)->value),(long)no_elements);
&(((const struct dbr_gr_char *)psrc)->value),(long)no_elements);
break;
case(oldDBR_GR_LONG):
status = dbPutField(paddr,DBR_LONG,
&(((struct dbr_gr_long *)psrc)->value),(long)no_elements);
&(((const struct dbr_gr_long *)psrc)->value),(long)no_elements);
break;
case(oldDBR_GR_DOUBLE):
status = dbPutField(paddr,DBR_DOUBLE,
&(((struct dbr_gr_double *)psrc)->value),(long)no_elements);
&(((const struct dbr_gr_double *)psrc)->value),(long)no_elements);
break;
case(oldDBR_CTRL_STRING):
/* no struct dbr_ctrl_string - use dbr_sts_string instead */
status = dbPutField(paddr,DBR_STRING,
((struct dbr_sts_string *)psrc)->value,(long)no_elements);
((const struct dbr_sts_string *)psrc)->value,(long)no_elements);
break;
/* case(oldDBR_CTRL_INT): */
case(oldDBR_CTRL_SHORT):
status = dbPutField(paddr,DBR_SHORT,
&(((struct dbr_ctrl_short *)psrc)->value),(long)no_elements);
&(((const struct dbr_ctrl_short *)psrc)->value),(long)no_elements);
break;
case(oldDBR_CTRL_FLOAT):
status = dbPutField(paddr,DBR_FLOAT,
&(((struct dbr_ctrl_float *)psrc)->value),(long)no_elements);
&(((const struct dbr_ctrl_float *)psrc)->value),(long)no_elements);
break;
case(oldDBR_CTRL_ENUM):
status = dbPutField(paddr,DBR_ENUM,
&(((struct dbr_ctrl_enum *)psrc)->value),(long)no_elements);
&(((const struct dbr_ctrl_enum *)psrc)->value),(long)no_elements);
break;
case(oldDBR_CTRL_CHAR):
status = dbPutField(paddr,DBR_UCHAR,
&(((struct dbr_ctrl_char *)psrc)->value),(long)no_elements);
&(((const struct dbr_ctrl_char *)psrc)->value),(long)no_elements);
break;
case(oldDBR_CTRL_LONG):
status = dbPutField(paddr,DBR_LONG,
&(((struct dbr_ctrl_long *)psrc)->value),(long)no_elements);
&(((const struct dbr_ctrl_long *)psrc)->value),(long)no_elements);
break;
case(oldDBR_CTRL_DOUBLE):
status = dbPutField(paddr,DBR_DOUBLE,
&(((struct dbr_ctrl_double *)psrc)->value),(long)no_elements);
&(((const struct dbr_ctrl_double *)psrc)->value),(long)no_elements);
break;
case(oldDBR_PUT_ACKT):
status = dbPutField(paddr,DBR_PUT_ACKT,psrc,(long)no_elements);

21
src/db/recGbl.c
View File

@@ -47,12 +47,13 @@
RECGBL_ALARM_HOOK_ROUTINE recGblAlarmHook = NULL;
/* local routines */
static void getMaxRangeValues();
static void getMaxRangeValues(short field_type, double *pupper_limit,
double *plower_limit);
void epicsShareAPI recGblDbaddrError(
long status,struct dbAddr *paddr,char *pmessage)
void epicsShareAPI recGblDbaddrError(long status, struct dbAddr *paddr,
const char *pmessage)
{
dbCommon *precord = 0;
dbFldDes *pdbFldDes = 0;
@@ -70,7 +71,8 @@ void epicsShareAPI recGblDbaddrError(
return;
}
void epicsShareAPI recGblRecordError(long status,void *pdbc,char *pmessage)
void epicsShareAPI recGblRecordError(long status, void *pdbc,
const char *pmessage)
{
dbCommon *precord = pdbc;
@@ -81,9 +83,8 @@ void epicsShareAPI recGblRecordError(long status,void *pdbc,char *pmessage)
return;
}
void epicsShareAPI recGblRecSupError(
long status,struct dbAddr *paddr,char *pmessage,
char *psupport_name)
void epicsShareAPI recGblRecSupError(long status, struct dbAddr *paddr,
const char *pmessage, const char *psupport_name)
{
dbCommon *precord = 0;
dbFldDes *pdbFldDes = 0;
@@ -316,10 +317,8 @@ void epicsShareAPI recGblTSELwasModified(struct link *plink)
}
}
static void getMaxRangeValues(field_type,pupper_limit,plower_limit)
short field_type;
double *pupper_limit;
double *plower_limit;
static void getMaxRangeValues(short field_type, double *pupper_limit,
double *plower_limit)
{
switch(field_type){
case(DBF_CHAR):

6
src/db/recGbl.h
View File

@@ -48,11 +48,11 @@ extern RECGBL_ALARM_HOOK_ROUTINE recGblAlarmHook;
/* Global Record Support Routines */
epicsShareFunc void epicsShareAPI recGblDbaddrError(
long status, struct dbAddr *paddr, char *pcaller_name);
long status, struct dbAddr *paddr, const char *pcaller_name);
epicsShareFunc void epicsShareAPI recGblRecordError(
long status, void *precord, char *pcaller_name);
long status, void *precord, const char *pcaller_name);
epicsShareFunc void epicsShareAPI recGblRecSupError(
long status, struct dbAddr *paddr, char *pcaller_name, char *psupport_name);
long status, struct dbAddr *paddr, const char *pcaller_name, const char *psupport_name);
epicsShareFunc void epicsShareAPI recGblGetGraphicDouble(
struct dbAddr *paddr, struct dbr_grDouble *pgd);
epicsShareFunc void epicsShareAPI recGblGetControlDouble(