- 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
dornier2.c
14
dornier2.c
@@ -217,7 +217,7 @@ static int DornierText(pVelSelDriv self, char *pText, int iTextLen)
|
||||
sprintf(pHelp, "Vaccum: %f, Accel: %f", sStatus.vacuum, sStatus.accel);
|
||||
strcat(pBueffel, pHelp);
|
||||
|
||||
strncpy(pText, pBueffel, iTextLen);
|
||||
strlcpy(pText, pBueffel, iTextLen);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -314,23 +314,23 @@ static int DornierError(pVelSelDriv self, int *iCode,
|
||||
|
||||
switch (pDorn->iLastError) {
|
||||
case HALTREQ:
|
||||
strncpy(error, "Repeat command if you really want to HALT selector",
|
||||
strlcpy(error, "Repeat command if you really want to HALT selector",
|
||||
iErrLen);
|
||||
pDorn->haltCount++;
|
||||
break;
|
||||
case STARTED:
|
||||
strncpy(error,
|
||||
strlcpy(error,
|
||||
"Started selector, standby and check manually when ready",
|
||||
iErrLen);
|
||||
break;
|
||||
case INVALIDSTATUS:
|
||||
strncpy(error, "Received invalid status reply", iErrLen);
|
||||
strlcpy(error, "Received invalid status reply", iErrLen);
|
||||
break;
|
||||
case TARGETREJECTED:
|
||||
strncpy(error, "VS in local mode or target out of range", iErrLen);
|
||||
strlcpy(error, "VS in local mode or target out of range", iErrLen);
|
||||
break;
|
||||
case NOSTATUS:
|
||||
strncpy(error, "No successfull status request after 3 tries", iErrLen);
|
||||
strlcpy(error, "No successfull status request after 3 tries", iErrLen);
|
||||
break;
|
||||
default:
|
||||
getRS232Error(pDorn->iLastError, error, iErrLen);
|
||||
@@ -634,7 +634,7 @@ pVelSelDriv VSCreateDornier2003(char *name, Tcl_Interp * pTcl)
|
||||
free(pDorn);
|
||||
return NULL;
|
||||
}
|
||||
strncpy(pHost, pPtr, 131);
|
||||
strlcpy(pHost, pPtr, 131);
|
||||
|
||||
/* port number */
|
||||
pPtr = (char *) Tcl_GetVar2(pTcl, name, "Port", TCL_GLOBAL_ONLY);
|
||||
|
||||
Reference in New Issue
Block a user