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

Fix some compiler warnings and mixed space/tab indentation

Browse Source
This commit is contained in:
Douglas Clowes
2014-02-19 14:37:13 +11:00
parent 54e217af78
commit 4bfa758667
9 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asynnet.c
View File

@ -45,7 +45,7 @@
#define MAXCONNECTIONS 1024 #define MAXCONNECTIONS 1024
#define RBUFFERSIZE 262144 /* 256kb */ #define RBUFFERSIZE 262144 /* 256kb */
#define WBUFFERSIZE 20*262144 #define WBUFFERSIZE 20*262144
/* #define WBUFFERSIZE 100*262144 /* /* #define WBUFFERSIZE 100*262144 */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
typedef struct { typedef struct {
int socket; int socket;

2
commandlog.c
View File

@ -536,7 +536,7 @@ int CommandLog(SConnection * pCon, SicsInterp * pSics, void *pData,
if (iCompact > 0) if (iCompact > 0)
iIntervall = 0; iIntervall = 0;
} }
SCPrintf(pCon, eValue, "%s.compact [sec] = %d", argv[0], iCompact); SCPrintf(pCon, eValue, "%s.compact [sec] = %d", argv[0], (int)iCompact);
return 1; return 1;
} else if (strcmp(argv[1], "close") == 0) { /* close command */ } else if (strcmp(argv[1], "close") == 0) { /* close command */
fclose(fd); fclose(fd);

2
counter.c
View File

@ -1142,7 +1142,7 @@ int CountAction(SConnection * pCon, SicsInterp * pSics, void *pData,
iRet = self->pDriv->Get(self->pDriv, PaRes.Arg[0].text, iRet = self->pDriv->Get(self->pDriv, PaRes.Arg[0].text,
PaRes.Arg[1].iVal, &fVal); PaRes.Arg[1].iVal, &fVal);
if (iRet == 1) { if (iRet == 1) {
snprintf(pBueffel,255, "%s.%s %d = %f", argv[0], PaRes.Arg[0].text, snprintf(pBueffel,255, "%s.%s %s = %f", argv[0], PaRes.Arg[0].text,
PaRes.Arg[1].text, fVal); PaRes.Arg[1].text, fVal);
SCWrite(pCon, pBueffel, eValue); SCWrite(pCon, pBueffel, eValue);
return 1; return 1;

26
diffscan.c
View File

@ -376,7 +376,7 @@ static int DiffScanTask(void *pData)
status = GetDrivablePosition(pVar->pObject, self->scanObject->pCon, status = GetDrivablePosition(pVar->pObject, self->scanObject->pCon,
&fPos); &fPos);
if (status == 0) { if (status == 0) {
ReleaseCountLock(pCount->pCountInt); ReleaseCountLock(pCount->pCountInt);
return finish; return finish;
} }
AppendScanVar(pVar, fPos); AppendScanVar(pVar, fPos);
@ -396,21 +396,21 @@ static int DiffScanTask(void *pData)
rawCount = data->lCount; rawCount = data->lCount;
rawMon = data->Monitors[self->scaleMonitor - 1]; rawMon = data->Monitors[self->scaleMonitor - 1];
if(rawMon > 100){ if(rawMon > 100){
self->normalizationScale = rawMon; self->normalizationScale = rawMon;
traceSys("diffscan","START:normalizing on %d, scale monitor is %d", traceSys("diffscan","START:normalizing on %d, scale monitor is %d",
self->normalizationScale, self->scaleMonitor); self->normalizationScale, self->scaleMonitor);
} else { } else {
traceSys("diffscan","START:normalization count %d, on scale monitor is %d and is to low", traceSys("diffscan","START:normalization count %ld, on scale monitor is %d and is to low",
rawMon, self->scaleMonitor); rawMon, self->scaleMonitor);
SCWrite(self->scanObject->pCon,"WARNING: Skipping first point because of low count rate", eWarning); SCWrite(self->scanObject->pCon,"WARNING: Skipping first point because of low count rate", eWarning);
return finish; return finish;
} }
} else { } else {
if (data->Monitors[self->scaleMonitor - 1] - if (data->Monitors[self->scaleMonitor - 1] -
self->last.Monitors[self->scaleMonitor - 1] < 5) { self->last.Monitors[self->scaleMonitor - 1] < 5) {
SCWrite(self->scanObject->pCon, "WARNING: low count rate", eLog); SCWrite(self->scanObject->pCon, "WARNING: low count rate", eLog);
traceSys("diffscan","RUN:low monitor difference from %d to %d",data->Monitors[self->scaleMonitor-1], traceSys("diffscan","RUN:low monitor difference from %ld to %ld",data->Monitors[self->scaleMonitor-1],
self->last.Monitors[self->scaleMonitor -1]); self->last.Monitors[self->scaleMonitor -1]);
} }
rawCount = data->lCount; rawCount = data->lCount;
rawMon = data->Monitors[self->scaleMonitor - 1]; rawMon = data->Monitors[self->scaleMonitor - 1];
@ -441,8 +441,8 @@ static int DiffScanTask(void *pData)
ReleaseHdbValue(&v); ReleaseHdbValue(&v);
} }
InvokeCallBack(self->scanObject->pCall, SCANPOINT, self->scanObject); InvokeCallBack(self->scanObject->pCall, SCANPOINT, self->scanObject);
traceSys("diffscan","RUN: pos, count, rawcount, rawmon: %f, %d, %d, %d", traceSys("diffscan","RUN: pos, count, rawcount, rawmon: %f, %f, %ld, %ld",
fPos, countValue, rawCount, rawMon); fPos, countValue, rawCount, rawMon);
/* /*
check for interrupt check for interrupt
@ -455,7 +455,7 @@ static int DiffScanTask(void *pData)
} }
if(finish == 0) { if(finish == 0) {
ReleaseCountLock(pCount->pCountInt); ReleaseCountLock(pCount->pCountInt);
} }
return finish; return finish;

8
nxxml.c
View File

@ -779,7 +779,7 @@ NXstatus NXXputdatatable (NXhandle fid, const void *data){
} }
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
NXstatus NXXputdata (NXhandle fid, void *data){ NXstatus NXXputdata (NXhandle fid, const void *data){
pXMLNexus xmlHandle = NULL; pXMLNexus xmlHandle = NULL;
mxml_node_t *userData = NULL; mxml_node_t *userData = NULL;
mxml_node_t *current = NULL; mxml_node_t *current = NULL;
@ -1074,8 +1074,8 @@ NXstatus NXXputslabtable (NXhandle fid, const void *data,
return NX_OK; return NX_OK;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
NXstatus NXXputslab64 (NXhandle fid, void *data, NXstatus NXXputslab64 (NXhandle fid, const void *data,
int64_t iStart[], int64_t iSize[]){ const int64_t iStart[], const int64_t iSize[]){
pXMLNexus xmlHandle = NULL; pXMLNexus xmlHandle = NULL;
mxml_node_t *userData = NULL; mxml_node_t *userData = NULL;
@ -1295,7 +1295,7 @@ static char *formatAttributeData(const void *data, int datalen, int iType){
return number; return number;
} }
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
NXstatus NXXputattr (NXhandle fid, CONSTCHAR *name, void *data, NXstatus NXXputattr (NXhandle fid, CONSTCHAR *name, const void *data,
int datalen, int iType){ int datalen, int iType){
char buffer[256]; char buffer[256];
pXMLNexus xmlHandle = NULL; pXMLNexus xmlHandle = NULL;

8
nxxml.h
View File

@ -44,15 +44,15 @@ NXstatus NXXmakedata64 (NXhandle fid,
int rank, int64_t dimensions[]); int rank, int64_t dimensions[]);
NXstatus NXXopendata (NXhandle fid, CONSTCHAR *name); NXstatus NXXopendata (NXhandle fid, CONSTCHAR *name);
NXstatus NXXclosedata (NXhandle fid); NXstatus NXXclosedata (NXhandle fid);
NXstatus NXXputdata (NXhandle fid, void *data); NXstatus NXXputdata (NXhandle fid, const void *data);
NXstatus NXXgetdata (NXhandle fid, void *data); NXstatus NXXgetdata (NXhandle fid, void *data);
NXstatus NXXgetinfo64 (NXhandle fid, int *rank, NXstatus NXXgetinfo64 (NXhandle fid, int *rank,
int64_t dimension[], int *iType); int64_t dimension[], int *iType);
NXstatus NXXputslab64 (NXhandle fid, void *data, NXstatus NXXputslab64 (NXhandle fid, const void *data,
int64_t iStart[], int64_t iSize[]); const int64_t iStart[], const int64_t iSize[]);
NXstatus NXXgetslab64 (NXhandle fid, void *data, NXstatus NXXgetslab64 (NXhandle fid, void *data,
const int64_t iStart[], const int64_t iSize[]); const int64_t iStart[], const int64_t iSize[]);
NXstatus NXXputattr (NXhandle fid, CONSTCHAR *name, void *data, NXstatus NXXputattr (NXhandle fid, CONSTCHAR *name, const void *data,
int datalen, int iType); int datalen, int iType);
NXstatus NXXgetattr (NXhandle fid, char *name, NXstatus NXXgetattr (NXhandle fid, char *name,
void *data, int* datalen, int* iType); void *data, int* datalen, int* iType);

2
sansbc.c
View File

@ -204,7 +204,7 @@ static int StatCmd(pSICSOBJ self, SConnection *pCon, pHdb commandNode,
} }
average = (double)sum/(double)length; average = (double)sum/(double)length;
SCPrintf(pCon,eValue,"Stat:sum,max,min,av = %d,%d,%d,%f", sum,max,min,average); SCPrintf(pCon,eValue,"Stat:sum,max,min,av = %ld,%ld,%ld,%f", sum,max,min,average);
return 1; return 1;
} }

1
simidx.h
View File

@ -85,6 +85,7 @@ int SimIdxRun();
* \param errCode pointer to an integer error code * \param errCode pointer to an integer error code
* \param error A text buffer to hold a description of the error * \param error A text buffer to hold a description of the error
* \param errLen The length of error * \param errLen The length of error
*/
void SimIdxGetError(int *errCode, char *error, int errLen); void SimIdxGetError(int *errCode, char *error, int errLen);
/** /**

2
statistics.c
View File

@ -58,7 +58,7 @@ int StatisticsCommand(SConnection * con, SicsInterp * pSics, void *pData,
gettimeofday(&now, 0); gettimeofday(&now, 0);
dif = timeFloat(timeDif(lastStat, now)); dif = timeFloat(timeDif(lastStat, now));
SCPrintf(con, eLog, "calls/s time[%] full[%] mean[ms] command"); SCPrintf(con, eLog, "calls/s time[%%] full[%%] mean[ms] command");
SCPrintf(con, eLog, "----------------------------------------------"); SCPrintf(con, eLog, "----------------------------------------------");
for (p = list; p != NULL; p = p->next) { for (p = list; p != NULL; p = p->next) {
if (dif > 0) { if (dif > 0) {