- Changed strncpy to strlcpy, strncat to strlcat
- Added strlcpy and strlcat to SICS - Added a driver for the POLDI power supplies SKIPPED: psi/A1931.c psi/autowin.c psi/bruker.c psi/docho.c psi/dornier2.c psi/dspcode.c psi/ease.c psi/ecb.c psi/ecbcounter.c psi/ecbdriv.c psi/el734dc.c psi/el734driv.c psi/el734hp.c psi/el737driv.c psi/el737hpdriv.c psi/el737hpdrivsps.c psi/el737hpv2driv.c psi/el755driv.c psi/eurodriv.c psi/haakedriv.c psi/itc4driv.c psi/julcho.c psi/linadriv.c psi/lmd200.c psi/lscsupport.c psi/ltc11.c psi/make_gen psi/oicom.c psi/oxinst.c psi/pimotor.c psi/pipiezo.c psi/polterwrite.c psi/psi.c psi/sanscook.c psi/sanslirebin.c psi/sanswave.c psi/sinqhmdriv.c psi/sinqhttp.c psi/slsecho.c psi/slsmagnet.c psi/slsvme.c psi/sps.c psi/swmotor.c psi/swmotor2.c psi/tabledrive.c psi/tasscan.c psi/tdchm.c psi/velodorn.c psi/velodornier.c
This commit is contained in:
@ -131,7 +131,7 @@ static int MMCCStatus(void *pData, SConnection * pCon)
|
||||
|
||||
status = self->slaves[0]->CheckCountStatus(self->slaveData[0], pCon);
|
||||
pMaster = (pCounter)self->slaveData[0];
|
||||
pCount->pDriv->fLastCurrent = pMaster->pDriv->fLastCurrent;
|
||||
pCount->pDriv->fLastCurrent = GetControlValue(pMaster);
|
||||
if (status == HWIdle || status == HWFault) {
|
||||
/*
|
||||
stop counting on slaves when finished or when an error
|
||||
@ -368,9 +368,9 @@ static int MultiCounterError(struct __COUNTER *pDriv, int *iCode,
|
||||
|
||||
|
||||
if (pDriv->iErrorCode == NOCOUNTERS) {
|
||||
strncpy(error, "NO counters configured!", errlen);
|
||||
strlcpy(error, "NO counters configured!", errlen);
|
||||
} else {
|
||||
strncpy(error, "Not Implemented", errlen);
|
||||
strlcpy(error, "Not Implemented", errlen);
|
||||
}
|
||||
return COTERM;
|
||||
}
|
||||
|
Reference in New Issue
Block a user