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

Merge branch 'maverick' into develop

Browse Source 
Compile under OSX
This commit is contained in:
koennecke
2016-01-26 09:48:11 +01:00
parent f0021db2ff cdb9a8fba2
commit 5e597e2d10
46 changed files with 174 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scan.c
View File

@ -152,6 +152,8 @@ pScanData CreateScanObject(char *pRecover, char *pHeader, pCounter pCount,
/* assign various things */
if (pRecover) {
strlcpy(pNew->pRecover, pRecover,1024);
} else {
memset(pNew->pRecover,0,sizeof(pNew->pRecover));
}
if (pHeader) {
strlcpy(pNew->pHeaderFile, pHeader,1024);
@ -597,7 +599,7 @@ static int ScanLoop(pScanData self)
InvokeCallBack(self->pCall, SCANPOINT, self);
self->WriteScanPoints(self, i);
if (self->pRecover) {
if (strlen(self->pRecover) > 10) {
WriteRecover(self);
}
}
@ -1281,7 +1283,7 @@ static int ScanDynInterest(int iEvent, void *pEventData, void *pUser)
if (pCount != NULL) {
lVal = pCount->lCount;
} else {
lVal = -9999.99;
lVal = -9999;
}
snprintf(pBueffel, 255, "%s.scanpoint = {%d %f %ld}",
self->objectName, i, fVal, lVal);
@ -1628,7 +1630,7 @@ int ScanWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
float *fData = NULL;
int lNP;
int iChannel;
int iRet, iMode, i;
int iRet = 0, iMode, i;
char *pPtr = NULL, pItem[20];
long *lData = NULL, lID;
int *iData;