- Miscellaneous fixes for compiler warnings

This commit is contained in:
koennecke
2005-03-23 08:20:24 +00:00
parent b4a82c3bad
commit f43a5af7fc
7 changed files with 16 additions and 13 deletions

View File

@ -31,7 +31,7 @@
{
return WriteAmorScan(self->pFile,self->pCon,self);
}
return 1; /* guessed return value M.Z. */
return 1;
}
/*--------------------------------------------------------------------*/
static int AmorCollect(pScanData self, int iP)

View File

@ -530,35 +530,35 @@ static int downloadECBParam(pECBMotDriv self){
return 0;
}
if((status = loadSpeed(self,ObVal(self->driverPar,STARTSPEED),6) <= 0)){
if((status = loadSpeed(self,ObVal(self->driverPar,STARTSPEED),6)) <= 0){
return 0;
}
if((status = loadSpeed(self,ObVal(self->driverPar,MAXSPEED),5) <= 0)){
if((status = loadSpeed(self,ObVal(self->driverPar,MAXSPEED),5)) <= 0){
return 0;
}
if((status = loadSpeed(self,ObVal(self->driverPar,SLOWAUTO),4) <= 0)){
if((status = loadSpeed(self,ObVal(self->driverPar,SLOWAUTO),4)) <= 0){
return 0;
}
if((status = loadSpeed(self,ObVal(self->driverPar,SLOWMAN),10) <= 0)){
if((status = loadSpeed(self,ObVal(self->driverPar,SLOWMAN),10)) <= 0){
return 0;
}
if((status = loadDelay(self) <= 0)){
if((status = loadDelay(self)) <= 0){
return 0;
}
if((status = loadMulti(self) <= 0)){
if((status = loadMulti(self)) <= 0){
return 0;
}
if((status = ecbLoadEncoder(self->ecb) <= 0)){
if((status = ecbLoadEncoder(self->ecb)) <= 0){
return 0;
}
if((status = loadOffset(self,ObVal(self->driverPar,OFFSET)) <= 0)){
if((status = loadOffset(self,ObVal(self->driverPar,OFFSET))) <= 0){
return 0;
}
@ -572,7 +572,7 @@ static int downloadECBParam(pECBMotDriv self){
self->driverPar[MULT].fVal = .0;
}
if((status = loadGearing(self) <= 0)){
if((status = loadGearing(self)) <= 0){
return 0;
}

View File

@ -503,7 +503,7 @@ static int EL737FixIt(struct __COUNTER *self, int iCode){
break;
case TOMANYCOUNTS:
case SYSERROR:
return COTERM; /* guessed return value M.Z. */
return COTERM;
break;
default:
/*

View File

@ -554,5 +554,5 @@ HistInt *CheckBank(pFocusAverager self, SConnection *pCon,
mergData = getFMBankPointer(4);
return mergData;
}
return NULL; /* inserted statement, guessed return value M.Z */
return NULL;
}

View File

@ -1243,6 +1243,7 @@ name of hkl object holding crystallographic information
free(self->pCurrentFile);
pText = makeFilename(pServ->pSics,pCon);
changeExtension(pText,"hdf");
if(pText == NULL)
{
return 0;

View File

@ -309,6 +309,7 @@ static int A6WaitCallback(int iEvent, void *pEventData, void *pUserData)
{
SicsWait(5);
}
return 1;
}
/*-----------------------------------------------------------------------
A function for killing the TAS data structure is needed

View File

@ -199,7 +199,8 @@ int TricsSupportAction(SConnection *pCon, SicsInterp *pSics, void *pData,
SCSendOK(pCon);
return 1;
} else {
return 0; /* guessed return value M.Z. */
SCWrite(pCon,"ERROR: subcommand to tricssuport not understood",eError);
return 0;
}
}