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

more changes to get epicsShare to work on win32

Browse Source
This commit is contained in:
Marty Kraimer
2003-03-28 20:25:43 +00:00
parent 21ee244b5e
commit 4b95841fcd
43 changed files with 142 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/db/dbNotify.c
+2 -2
View File
@@ -410,7 +410,7 @@ int epicsShareAPI dbNotifyDump(void)
if(precord->ppn->paddr->precord != precord) continue;
ppn = precord->ppn;
printf("%s state %d ppn %p\n waitList\n",
precord->name,ppn->state,ppn);
precord->name,ppn->state,(void*)ppn);
ppnrWait = (putNotifyRecord *)ellFirst(&ppn->waitList);
while(ppnrWait) {
printf(" %s pact %d\n",
@@ -420,7 +420,7 @@ int epicsShareAPI dbNotifyDump(void)
printf(" restartList\n");
ppnRestart = (putNotify *)ellFirst(&precord->ppnr->restartList);
while(ppnRestart) {
printf(" %p\n", ppnRestart);
printf(" %p\n", (void *)ppnRestart);
ppnRestart = (putNotify *)ellNext(&ppnRestart->restartNode.node);
}
}
src/db/dbTest.c
+7 -7
View File
@@ -244,8 +244,8 @@ static int specified_by(char *ptest, char *pspec)
pspec += inx;
/* check for end of specification */
if (*pspec == NULL) {
if (*ptest == NULL) return(TRUE);
if (*pspec == 0) {
if (*ptest == 0) return(TRUE);
else return(FALSE);
}
}
@@ -334,7 +334,7 @@ long epicsShareAPI dbpf(char *pname,char *pvalue)
/* If entire field is digits then use DBR_ENUM else DBR_STRING*/
if((addr.dbr_field_type==DBR_ENUM) && (*pvalue!=0)
&& (strspn(pvalue,"0123456789")==strlen(pvalue))) {
short value;
unsigned short value;
sscanf(pvalue,"%hu",&value);
status=dbPutField(&addr,DBR_ENUM,&value,1L);
@@ -626,8 +626,8 @@ long epicsShareAPI dbtpf(char *pname,char *pvalue)
}
} else printf("sscanf failed for DBR_DOUBLE\n");
/* DBR_ENUM */
if(validNumber && sscanf(pvalue,"%hu",&svalue)==1) {
status=dbPutField(&addr,DBR_ENUM,&svalue,1L);
if(validNumber && sscanf(pvalue,"%hu",&usvalue)==1) {
status=dbPutField(&addr,DBR_ENUM,&usvalue,1L);
if(status!=0) errMessage(status,"DBR_ENUM failed");
else {
printf("DBR_ENUM ok\n");
@@ -744,9 +744,9 @@ static void printDbAddr(long status,DBADDR *paddr)
if(status!=0) {
errMessage(status,"dbNameToAddr error");
}
printf("Record Address: %p",paddr->precord);
printf("Record Address: %p",(void *)paddr->precord);
printf(" Field Address: %p",paddr->pfield);
printf(" Field Description: %p\n",pdbFldDes);
printf(" Field Description: %p\n",(void *)pdbFldDes);
printf(" No Elements: %ld\n",paddr->no_elements);
printf(" Record Type: %s\n",pdbFldDes->pdbRecordType->name);
printf(" FieldType: DBF_");
src/db/db_test.c
+3 -3
View File
@@ -51,7 +51,7 @@ int epicsShareAPI gft(char *pname)
return(1);
}
printf(" Record Name: %s\n",pname);
printf("Record Address: 0x%p\n",addr.precord);
printf("Record Address: 0x%p\n",(void *)addr.precord);
printf(" Field Type: %d\n",addr.dbr_field_type);
printf(" Field Address: 0x%p\n",addr.pfield);
printf(" Field Size: %d\n",addr.field_size);
@@ -107,7 +107,7 @@ int epicsShareAPI pft(char *pname,char *pvalue)
return(1);
}
printf(" Record Name: %s\n",pname);
printf("Record Address: 0x%p\n",addr.precord);
printf("Record Address: 0x%p\n",(void *)addr.precord);
printf(" Field Type: %d\n",addr.dbr_field_type);
printf(" Field Address: 0x%p\n",addr.pfield);
printf(" Field Size: %d\n",addr.field_size);
@@ -154,7 +154,7 @@ int epicsShareAPI pft(char *pname,char *pvalue)
printf("\n\t CHAR GET failed");
else print_returned(DBR_CHAR,buffer,1);
}
if(sscanf(pvalue,"%hu",&shortvalue)==1) {
if(sscanf(pvalue,"%hd",&shortvalue)==1) {
if (db_put_field(paddr,DBR_ENUM,&shortvalue,1) < 0)
printf("\n\t ENUM failed ");
if (db_get_field(paddr,DBR_ENUM,buffer,1,NULL) < 0)
src/db/recGbl.c
+3 -3
View File
@@ -208,7 +208,7 @@ int epicsShareAPI recGblInitConstantLink(
unsigned short value;
unsigned char *pvalue = (unsigned char *)pdest;
sscanf(plink->value.constantStr,"%hi",&value);
sscanf(plink->value.constantStr,"%hu",&value);
*pvalue = value;
}
break;
@@ -219,13 +219,13 @@ int epicsShareAPI recGblInitConstantLink(
case DBF_ENUM :
case DBF_MENU :
case DBF_DEVICE :
sscanf(plink->value.constantStr,"%hi",(unsigned short *)pdest);
sscanf(plink->value.constantStr,"%hu",(unsigned short *)pdest);
break;
case DBF_LONG :
sscanf(plink->value.constantStr,"%li",(long *)pdest);
break;
case DBF_ULONG :
sscanf(plink->value.constantStr,"%li",(unsigned long *)pdest);
sscanf(plink->value.constantStr,"%lu",(unsigned long *)pdest);
break;
case DBF_FLOAT :
sscanf(plink->value.constantStr,"%f",(float *)pdest);