From 47ad9222a2efc09640d22463e291730f7704f781 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 24 Jun 1996 13:23:53 +0000 Subject: [PATCH] extension .db goes to .dbd --- src/cvtDctsdr/calink.h | 25 +++++++++++++++++++++++++ src/cvtDctsdr/dbStaticLib.c | 6 +++--- src/cvtDctsdr/sdr2device.c | 2 +- src/cvtDctsdr/sdr2driver.c | 2 +- src/cvtDctsdr/sdr2gblmenu.c | 2 +- src/cvtDctsdr/sdr2recordtype.c | 4 ++-- 6 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 src/cvtDctsdr/calink.h diff --git a/src/cvtDctsdr/calink.h b/src/cvtDctsdr/calink.h new file mode 100644 index 000000000..5196f8090 --- /dev/null +++ b/src/cvtDctsdr/calink.h @@ -0,0 +1,25 @@ +/* + * $Id$ + */ +#ifndef INCcalinkh +#define INCcalinkh + +#ifndef INCerrMdefh +#include +#endif +#define S_dbCa_nullarg (M_dbCa | 1) /*dbCa_nullarg*/ +#define S_dbCa_failedmalloc (M_dbCa | 3) /*dbCa_failedmalloc*/ +#define S_dbCa_foundnull (M_dbCa | 5) /*dbCa_foundnull*/ +#define S_dbCa_ECA_EVDISALLOW (M_dbCa | 7) /*dbCa_ECA_EVDISALLOW*/ +#define S_dbCa_ECA_BADCHID (M_dbCa | 9) /*dbCa_ECA_BADCHID*/ +#define S_dbCa_ECA_BADTYPE (M_dbCa | 11) /*dbCa_ECA_BADTYPE*/ +#define S_dbCa_ECA_ALLOCMEM (M_dbCa | 13) /*dbCa_ECA_ALLOCMEM*/ +#define S_dbCa_ECA_ADDFAIL (M_dbCa | 15) /*dbCa_ECA_ADDFAIL*/ +#define S_dbCa_ECA_STRTOBIG (M_dbCa | 17) /*dbCa_ECA_STRTOBIG*/ +#define S_dbCa_ECA_GETFAIL (M_dbCa | 19) /*dbCa_ECA_GETFAIL*/ +#define S_dbCa_ECA_BADCOUNT (M_dbCa | 21) /*dbCa_ECA_BADCOUNT*/ +#define S_dbCa_ECA_PUTFAIL (M_dbCa | 23) /*dbCa_ECA_PUTFAIL*/ +#define S_dbCa_unknownECA (M_dbCa | 25) /*dbCa_unknownECA*/ +#define S_dbCa_dbfailure (M_dbCa | 27) /*dbCa_dbfailure*/ +#define S_dbCa_cafailure (M_dbCa | 29) /*dbCa_cafailure*/ +#endif /* INCcalinkh */ diff --git a/src/cvtDctsdr/dbStaticLib.c b/src/cvtDctsdr/dbStaticLib.c index e227bc74d..3be386ef1 100644 --- a/src/cvtDctsdr/dbStaticLib.c +++ b/src/cvtDctsdr/dbStaticLib.c @@ -740,7 +740,7 @@ char *precordName; struct recLoc *precLoc = NULL; short rec_size; - if(strlen(precordName)>PVNAME_SZ) return(S_dbLib_nameLength); + if(strlen(precordName)>(size_t)PVNAME_SZ) return(S_dbLib_nameLength); /* clear callers entry */ zeroDbentry(pdbentry); if(!dbFindRecord(pdbentry,precordName)) return (S_dbLib_recExists); @@ -938,7 +938,7 @@ char *newName; long status; DBENTRY dbentry; - if(strlen(newName)>PVNAME_SZ) return(S_dbLib_nameLength); + if(strlen(newName)>(size_t)PVNAME_SZ) return(S_dbLib_nameLength); if(!precnode) return(S_dbLib_recNotFound); dbInitEntry(pdbentry->pdbbase,&dbentry); status = dbFindRecord(&dbentry,newName); @@ -1623,7 +1623,7 @@ char *pstring; if(pstr[ind]!=' ' && pstr[ind]!='\t') break; pstr[ind] = '\0'; } - if(!pstr || strlen(pstr)<=0 ) { + if(!pstr || strlen(pstr)<(size_t)0 ) { if(plink->type==PV_LINK) dbCvtLinkToConstant(pdbentry); if(plink->type!=CONSTANT) return(S_dbLib_badField); return(0); diff --git a/src/cvtDctsdr/sdr2device.c b/src/cvtDctsdr/sdr2device.c index 43a02860e..553b4ec9e 100644 --- a/src/cvtDctsdr/sdr2device.c +++ b/src/cvtDctsdr/sdr2device.c @@ -93,7 +93,7 @@ int main(int argc,char **argv) exit(-1); } fclose(fp); - strcpy(pfilename,"device.db"); + strcpy(pfilename,"device.dbd"); fp = fopen(pfilename,"w"); if(!fp) { printf("Error opening file %s\n",pfilename); diff --git a/src/cvtDctsdr/sdr2driver.c b/src/cvtDctsdr/sdr2driver.c index a0065e86c..c63cf047b 100644 --- a/src/cvtDctsdr/sdr2driver.c +++ b/src/cvtDctsdr/sdr2driver.c @@ -69,7 +69,7 @@ int main(int argc,char **argv) exit(-1); } fclose(fp); - strcpy(pfilename,"driver.db"); + strcpy(pfilename,"driver.dbd"); fp = fopen(pfilename,"w"); if(!fp) { printf("Error opening file %s\n",pfilename); diff --git a/src/cvtDctsdr/sdr2gblmenu.c b/src/cvtDctsdr/sdr2gblmenu.c index 45fd9aff0..aaa5cadf8 100644 --- a/src/cvtDctsdr/sdr2gblmenu.c +++ b/src/cvtDctsdr/sdr2gblmenu.c @@ -89,7 +89,7 @@ int main(int argc,char **argv) fclose(fp); for(i=0; ino_fields; indFldDes++) { if(strcmp(precTypDes->papFldDes[indFldDes]->fldname,"FLNK")==0) break;