From 3186daf754081e2210155448eb6a1932cd7925fa Mon Sep 17 00:00:00 2001 From: rivers Date: Fri, 21 Dec 2012 23:09:03 +0000 Subject: [PATCH] Fixed problems with asynPrint formats git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15799 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/andorSrc/andorCCD.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ADApp/andorSrc/andorCCD.cpp b/ADApp/andorSrc/andorCCD.cpp index ce3e660..791014b 100755 --- a/ADApp/andorSrc/andorCCD.cpp +++ b/ADApp/andorSrc/andorCCD.cpp @@ -1226,8 +1226,8 @@ void AndorCCD::dataTask(void) status = GetNumberNewImages(&firstImage, &lastImage); if (status != DRV_SUCCESS) continue; asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW, - "%s:%s:, firstImage=%d, lastImage=%d\n", - driverName, functionName, firstImage, lastImage); + "%s:%s:, firstImage=%ld, lastImage=%ld\n", + driverName, functionName, (long)firstImage, (long)lastImage); for (i=firstImage; i<=lastImage; i++) { // Update counters getIntegerParam(NDArrayCounter, &imageCounter); @@ -1247,8 +1247,8 @@ void AndorCCD::dataTask(void) // Is there still an image available? status = GetNumberNewImages(&firstImage, &lastImage); asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW, - "%s:%s:, GetNumberNewImages, status=%d, firstImage=%d, lastImage=%d\n", - driverName, functionName, status, firstImage, lastImage); + "%s:%s:, GetNumberNewImages, status=%d, firstImage=%ld, lastImage=%ld\n", + driverName, functionName, status, (long)firstImage, (long)lastImage); if (dataType == NDUInt32) { asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW, "%s:%s:, GetImages(%d, %d, %p, %d, %p, %p)\n", @@ -1259,7 +1259,7 @@ void AndorCCD::dataTask(void) } else if (dataType == NDUInt16) { asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW, - "%s:%s:, GetImages16(%d, %d, %p, %d, &p, &p)\n", + "%s:%s:, GetImages16(%d, %d, %p, %d, %p, %p)\n", driverName, functionName, i, i, pArray->pData, sizeX*sizeY, &validFirst, &validLast); checkStatus(GetImages16(i, i, (epicsUInt16*)pArray->pData, sizeX*sizeY, &validFirst, &validLast));