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

Merge branch 'master' into maverick

Browse Source
This commit is contained in:
koennecke
2016-01-26 10:56:19 +01:00
parent cdb9a8fba2 73d6c5f5fb
commit 1149227685
116 changed files with 7295 additions and 1935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
stdscan.c
View File

@ -498,21 +498,21 @@ int WriteScanPoints(pScanData self, int iPoint)
strlcat(pSteps, pItem,255);
}
}
strlcat(pLine, " Counts ",1024);
strlcat(pLine, "Monitor1 ",1024);
strlcat(pLine, "Monitor2 ",1024);
strlcat(pLine, "Monitor3 ",1024);
strlcat(pLine, "Time ",1024);
strlcat(pInfo, pSteps,1024);
strlcat(pLine, " Counts ",sizeof(pLine));
strlcat(pLine, "Monitor1 ",sizeof(pLine));
strlcat(pLine, "Monitor2 ",sizeof(pLine));
strlcat(pLine, "Monitor3 ",sizeof(pLine));
strlcat(pLine, "Time ",sizeof(pLine));
strlcat(pInfo, pSteps,sizeof(pLine));
snprintf(pItem,sizeof(pItem)-1, "\n%d Points,", self->iNP);
strlcat(pInfo, pItem,1024);
strlcat(pInfo, pItem,sizeof(pLine));
if (self->iMode == eTimer) {
strlcat(pInfo, " Mode: Timer,",1024);
strlcat(pInfo, " Mode: Timer,",sizeof(pLine));
} else {
strlcat(pInfo, " Mode: Monitor,",1024);
strlcat(pInfo, " Mode: Monitor,",sizeof(pLine));
}
snprintf(pItem,sizeof(pItem)-1, " Preset %f", self->fPreset);
strlcat(pInfo, pItem,1024);
strlcat(pInfo, pItem,sizeof(pLine));
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.4f ", GetScanVarPos(pVar, i));
strlcat(pLine, pItem,1024);
strlcat(pLine, pItem,sizeof(pLine));
}
}
/* 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);
strlcat(pLine, pItem,1024);
strlcat(pLine, pItem,sizeof(pLine));
snprintf(pItem,sizeof(pItem)-1, "%-11ld ", pData->Monitors[0]);
strlcat(pLine, pItem,1024);
strlcat(pLine, pItem,sizeof(pLine));
snprintf(pItem,sizeof(pItem)-1, "%-11ld ", pData->Monitors[1]);
strlcat(pLine, pItem,1024);
strlcat(pLine, pItem,sizeof(pLine));
snprintf(pItem,sizeof(pItem)-1, "%-11ld ", pData->Monitors[2]);
strlcat(pLine, pItem,1024);
snprintf(pItem,sizeof(pItem)-1, "%-5.1f ", pData->fTime);
strlcat(pLine, pItem,1024);
strlcat(pLine, pItem,sizeof(pLine));
snprintf(pItem,sizeof(pItem)-1, "%-8.3f ", pData->fTime);
strlcat(pLine, pItem,sizeof(pLine));
}
fprintf(self->fd, "%s\n", pLine);
}