- Changed strncpy to strlcpy, strncat to strlcat
- Added strlcpy and strlcat to SICS - Added a driver for the POLDI power supplies
This commit is contained in:
14
docho.c
14
docho.c
@@ -371,7 +371,7 @@ static int DoChoSetPar2(pCodri self, char *parname, char *pValue)
|
||||
}
|
||||
if (strstr(pReply, "error") != NULL) {
|
||||
pPriv->iError = CHOPERROR;
|
||||
strncpy(pPriv->pError, pReply, 79);
|
||||
strlcpy(pPriv->pError, pReply, 79);
|
||||
return 0;
|
||||
} else {
|
||||
pPriv->iError = 0;
|
||||
@@ -567,22 +567,22 @@ static int DoChoError(pCodri self, int *iCode, char *pError, int iLen)
|
||||
*iCode = pPriv->iError;
|
||||
switch (pPriv->iError) {
|
||||
case UNDRIVABLE:
|
||||
strncpy(pError, "Parameter is not drivable", iLen);
|
||||
strlcpy(pError, "Parameter is not drivable", iLen);
|
||||
break;
|
||||
case UNKNOWNPAR:
|
||||
strncpy(pError, "Parameter is unknown", iLen);
|
||||
strlcpy(pError, "Parameter is unknown", iLen);
|
||||
break;
|
||||
case PARERROR:
|
||||
strncpy(pError, "Internal parameter error", iLen);
|
||||
strlcpy(pError, "Internal parameter error", iLen);
|
||||
break;
|
||||
case BADSYNC:
|
||||
strncpy(pError, "Cannot drive slave chopper", iLen);
|
||||
strlcpy(pError, "Cannot drive slave chopper", iLen);
|
||||
break;
|
||||
case CHOPERROR:
|
||||
strncpy(pError, pPriv->pError, iLen);
|
||||
strlcpy(pError, pPriv->pError, iLen);
|
||||
break;
|
||||
case BADSTOP:
|
||||
strncpy(pError,
|
||||
strlcpy(pError,
|
||||
"User called STOP. WARNING: chopper is still untamed!", iLen);
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user