linse/sicspsi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Changed strncpy to strlcpy, strncat to strlcat

Browse Source 
- Added strlcpy and strlcat to SICS
- Added a driver for the POLDI power supplies
This commit is contained in:
koennecke
2010-04-13 15:08:40 +00:00
parent 9e4eabeed1
commit dec6b04fa6
49 changed files with 679 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
julcho.c
View File

@@ -219,9 +219,9 @@ static pHdbCallback MakeJulChoSetCallback(pJulCho driv, char *command,
return NULL;
}
cbData->pDriv = driv;
strncpy(cbData->comCode, command, 9);
strncpy(cbData->prefix, prefix, 9);
strncpy(cbData->postfix, postfix, 9);
strlcpy(cbData->comCode, command, 9);
strlcpy(cbData->prefix, prefix, 9);
strlcpy(cbData->postfix, postfix, 9);
hdbCB->next = NULL;
hdbCB->previous = NULL;
hdbCB->killFunc = free;
@@ -570,50 +570,50 @@ static void JulChoErrorcodeToString(int code, char *pError, int iLen)
{
switch (code) {
case FRAMEERROR:
strncpy(pError, "Frame error", iLen);
strlcpy(pError, "Frame error", iLen);
break;
case CKERROR:
strncpy(pError, "Checksum error", iLen);
strlcpy(pError, "Checksum error", iLen);
break;
case BADCOMMAND:
strncpy(pError, "Bad Command", iLen);
strlcpy(pError, "Bad Command", iLen);
break;
case WRONGNOPAR:
strncpy(pError, "Wrong number of parameters", iLen);
strlcpy(pError, "Wrong number of parameters", iLen);
break;
case ILLPAR:
strncpy(pError, "Illegal parameter", iLen);
strlcpy(pError, "Illegal parameter", iLen);
break;
case PARRANGE:
strncpy(pError, "Parameter out of range", iLen);
strlcpy(pError, "Parameter out of range", iLen);
break;
case BADERR:
strncpy(pError, "Controller error not recognised", iLen);
strlcpy(pError, "Controller error not recognised", iLen);
break;
case BADREPLY:
strncpy(pError, "Unexpected reply", iLen);
strlcpy(pError, "Unexpected reply", iLen);
break;
case NOTPAR:
strncpy(pError, "Unsupported parameter", iLen);
strlcpy(pError, "Unsupported parameter", iLen);
break;
case BADTEXT:
strncpy(pError, "Failed to convert text to number", iLen);
strlcpy(pError, "Failed to convert text to number", iLen);
break;
case ROPAR:
strncpy(pError, "Read only Parameter", iLen);
strlcpy(pError, "Read only Parameter", iLen);
break;
case NOMEM:
strncpy(pError, "Out of memory formatting parameter", iLen);
strlcpy(pError, "Out of memory formatting parameter", iLen);
break;
case HALT:
strncpy(pError, "User requested HALT; choppers status undefined ",
strlcpy(pError, "User requested HALT; choppers status undefined ",
iLen);
break;
case SICSCBRANGE:
strncpy(pError, "Parameter value out of range", iLen);
strlcpy(pError, "Parameter value out of range", iLen);
break;
case SICSCBRO:
strncpy(pError, "Parameter is READ-ONLY", iLen);
strlcpy(pError, "Parameter is READ-ONLY", iLen);
break;
default:
getRS232Error(code, pError, iLen);
@@ -1109,7 +1109,7 @@ static int JulChoGetPar(pCodri pDriv, char *parname,
self->errorCode = NOMEM;
return 0;
}
strncpy(pBuffer, GetCharArray(val), iBufLen);
strlcpy(pBuffer, GetCharArray(val), iBufLen);
DeleteDynString(val);
return 1;
}