linse/sics
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


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:
koennecke
2010-04-13 15:08:38 +00:00
parent d19e3e5ca9
commit b26b8fc735
83 changed files with 555 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
stdscan.c
View File

@ -197,7 +197,7 @@ void WriteTemplate(FILE * fd, FILE * temp, char *filename, pScanData pScan,
fprintf(fd, "%s\n", Tcl_GetStringResult(InterpGetTcl(pSics)));
} else {
SCWrite(pCon, "ERROR: failed to execute Tcl command", eError);
strncpy(pBuffer, Tcl_GetStringResult(InterpGetTcl(pSics)), 511);
strlcpy(pBuffer, Tcl_GetStringResult(InterpGetTcl(pSics)), 511);
SCWrite(pCon, pBuffer, eLogError);
continue;
}
@ -491,28 +491,28 @@ int WriteScanPoints(pScanData self, int iPoint)
pVar = (pVarEntry) pPtr;
if (pVar) {
snprintf(pItem,sizeof(pItem)-1, "%-9.9s ", ScanVarName(pVar));
strncat(pLine, pItem,511);
strlcat(pLine, pItem,511);
snprintf(pItem,30, "%s, ", ScanVarName(pVar));
strncat(pInfo, pItem,1024);
strlcat(pInfo, pItem,1024);
snprintf(pItem,30, "%f ", ScanVarStep(pVar));
strncat(pSteps, pItem,255);
strlcat(pSteps, pItem,255);
}
}
strncat(pLine, " Counts ",1024);
strncat(pLine, "Monitor1 ",1024);
strncat(pLine, "Monitor2 ",1024);
strncat(pLine, "Monitor3 ",1024);
strncat(pLine, "Time ",1024);
strncat(pInfo, pSteps,1024);
strlcat(pLine, " Counts ",1024);
strlcat(pLine, "Monitor1 ",1024);
strlcat(pLine, "Monitor2 ",1024);
strlcat(pLine, "Monitor3 ",1024);
strlcat(pLine, "Time ",1024);
strlcat(pInfo, pSteps,1024);
snprintf(pItem,sizeof(pItem)-1, "\n%d Points,", self->iNP);
strncat(pInfo, pItem,1024);
strlcat(pInfo, pItem,1024);
if (self->iMode == eTimer) {
strncat(pInfo, " Mode: Timer,",1024);
strlcat(pInfo, " Mode: Timer,",1024);
} else {
strncat(pInfo, " Mode: Monitor,",1024);
strlcat(pInfo, " Mode: Monitor,",1024);
}
snprintf(pItem,sizeof(pItem)-1, " Preset %f", self->fPreset);
strncat(pInfo, pItem,1024);
strlcat(pInfo, pItem,1024);
fprintf(self->fd, "%s\n", pInfo);
fprintf(self->fd, "%s\n", pLine);
@ -525,7 +525,7 @@ int WriteScanPoints(pScanData self, int iPoint)
pVar = (pVarEntry) pPtr;
if (pVar) {
snprintf(pItem,sizeof(pItem)-1, "%-9.3f ", GetScanVarPos(pVar, i));
strncat(pLine, pItem,1024);
strlcat(pLine, pItem,1024);
}
}
/* print Counts & Monitor */
@ -533,15 +533,15 @@ int WriteScanPoints(pScanData self, int iPoint)
pData = (pCountEntry) pPtr;
if (pData) {
snprintf(pItem,sizeof(pItem)-1, " %-11ld ", pData->lCount);
strncat(pLine, pItem,1024);
strlcat(pLine, pItem,1024);
snprintf(pItem,sizeof(pItem)-1, "%-11ld ", pData->Monitors[0]);
strncat(pLine, pItem,1024);
strlcat(pLine, pItem,1024);
snprintf(pItem,sizeof(pItem)-1, "%-11ld ", pData->Monitors[1]);
strncat(pLine, pItem,1024);
strlcat(pLine, pItem,1024);
snprintf(pItem,sizeof(pItem)-1, "%-11ld ", pData->Monitors[2]);
strncat(pLine, pItem,1024);
strlcat(pLine, pItem,1024);
snprintf(pItem,sizeof(pItem)-1, "%-5.1f ", pData->fTime);
strncat(pLine, pItem,1024);
strlcat(pLine, pItem,1024);
}
fprintf(self->fd, "%s\n", pLine);
}
@ -727,9 +727,9 @@ static int CollectScanDataIntern(pScanData self, int iPoint,
fVal = pVar->pInter->GetValue(pVar->pObject, self->pCon);
AppendScanVar(pVar, fVal);
snprintf(pItem,sizeof(pItem)-1, "%-9.9s ", ScanVarName(pVar));
strncat(pHead, pItem,2024);
strlcat(pHead, pItem,2024);
snprintf(pItem,sizeof(pItem)-1, "%-9.3f ", fVal);
strncat(pStatus, pItem,2024);
strlcat(pStatus, pItem,2024);
}
}
@ -739,23 +739,23 @@ static int CollectScanDataIntern(pScanData self, int iPoint,
/*
format header
*/
strncat(pHead, "Counts ",2024);
strlcat(pHead, "Counts ",2024);
snprintf(pItem,sizeof(pItem)-1, "%-14ld ", sCount.lCount);
strncat(pStatus, pItem,2024);
strlcat(pStatus, pItem,2024);
strncat(pHead, "Monitor1 ",2024);
strlcat(pHead, "Monitor1 ",2024);
snprintf(pItem,sizeof(pItem)-1, "%-11ld ", sCount.Monitors[0]);
strncat(pStatus, pItem,2024);
strncat(pHead, "Monitor2 ",2024);
strlcat(pStatus, pItem,2024);
strlcat(pHead, "Monitor2 ",2024);
snprintf(pItem,sizeof(pItem)-1, "%-11ld ", sCount.Monitors[1]);
strncat(pStatus, pItem,2024);
strncat(pHead, "Monitor3 ",2024);
strlcat(pStatus, pItem,2024);
strlcat(pHead, "Monitor3 ",2024);
snprintf(pItem,sizeof(pItem)-1, "%-11ld ", sCount.Monitors[2]);
strncat(pStatus, pItem,2024);
strncat(pHead, "Time ",2024);
strlcat(pStatus, pItem,2024);
strlcat(pHead, "Time ",2024);
snprintf(pItem,sizeof(pItem)-1, "%-6.1f", sCount.fTime);
strncat(pStatus, pItem,2024);
strlcat(pStatus, pItem,2024);
/* write progress */
/*