Fix gcc warning 'stringop-truncation'
This commit is contained in:
@@ -181,10 +181,10 @@ static long get_enum_str(const DBADDR *paddr, char *pstring)
|
||||
if(index!=biRecordVAL) {
|
||||
strcpy(pstring,"Illegal_Value");
|
||||
} else if(*pfield==0) {
|
||||
strncpy(pstring,prec->znam,sizeof(prec->znam));
|
||||
memcpy(pstring,prec->znam,sizeof(prec->znam));
|
||||
pstring[sizeof(prec->znam)] = 0;
|
||||
} else if(*pfield==1) {
|
||||
strncpy(pstring,prec->onam,sizeof(prec->onam));
|
||||
memcpy(pstring,prec->onam,sizeof(prec->onam));
|
||||
pstring[sizeof(prec->onam)] = 0;
|
||||
} else {
|
||||
strcpy(pstring,"Illegal_Value");
|
||||
@@ -198,9 +198,9 @@ static long get_enum_strs(const DBADDR *paddr,struct dbr_enumStrs *pes)
|
||||
|
||||
pes->no_str = 2;
|
||||
memset(pes->strs,'\0',sizeof(pes->strs));
|
||||
strncpy(pes->strs[0],prec->znam,sizeof(prec->znam));
|
||||
memcpy(pes->strs[0],prec->znam,sizeof(prec->znam));
|
||||
if(*prec->znam!=0) pes->no_str=1;
|
||||
strncpy(pes->strs[1],prec->onam,sizeof(prec->onam));
|
||||
memcpy(pes->strs[1],prec->onam,sizeof(prec->onam));
|
||||
if(*prec->onam!=0) pes->no_str=2;
|
||||
return(0);
|
||||
}
|
||||
|
||||
@@ -328,10 +328,10 @@ static long get_enum_str(const DBADDR *paddr, char *pstring)
|
||||
if(index!=indexof(VAL)) {
|
||||
strcpy(pstring,"Illegal_Value");
|
||||
} else if(*pfield==0) {
|
||||
strncpy(pstring,prec->znam,sizeof(prec->znam));
|
||||
memcpy(pstring,prec->znam,sizeof(prec->znam));
|
||||
pstring[sizeof(prec->znam)] = 0;
|
||||
} else if(*pfield==1) {
|
||||
strncpy(pstring,prec->onam,sizeof(prec->onam));
|
||||
memcpy(pstring,prec->onam,sizeof(prec->onam));
|
||||
pstring[sizeof(prec->onam)] = 0;
|
||||
} else {
|
||||
strcpy(pstring,"Illegal_Value");
|
||||
@@ -346,9 +346,9 @@ static long get_enum_strs(const DBADDR *paddr,struct dbr_enumStrs *pes)
|
||||
/*SETTING no_str=0 breaks channel access clients*/
|
||||
pes->no_str = 2;
|
||||
memset(pes->strs,'\0',sizeof(pes->strs));
|
||||
strncpy(pes->strs[0],prec->znam,sizeof(pes->strs[0]));
|
||||
memcpy(pes->strs[0],prec->znam,sizeof(pes->strs[0]));
|
||||
if(*prec->znam!=0) pes->no_str=1;
|
||||
strncpy(pes->strs[1],prec->onam,sizeof(pes->strs[1]));
|
||||
memcpy(pes->strs[1],prec->onam,sizeof(pes->strs[1]));
|
||||
if(*prec->onam!=0) pes->no_str=2;
|
||||
return(0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user