From ab50f1166b88f237d1db844209f10f981bef14ae Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Tue, 1 Sep 2009 16:20:52 +0000 Subject: [PATCH] Minor changes to avoid compiler warnings --- motorApp/NewportSrc/drvESP300.cc | 10 +++++----- motorApp/NewportSrc/drvMM3000.cc | 6 +++--- motorApp/NewportSrc/drvMM4000.cc | 10 +++++----- motorApp/NewportSrc/drvPM500.cc | 10 +++++----- motorApp/NewportSrc/drvXPSAsynAux.c | 4 ++-- motorApp/NewportSrc/xps_ftp.c | 4 ++++ 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/motorApp/NewportSrc/drvESP300.cc b/motorApp/NewportSrc/drvESP300.cc index 52370bc4..b80d8f8e 100644 --- a/motorApp/NewportSrc/drvESP300.cc +++ b/motorApp/NewportSrc/drvESP300.cc @@ -2,9 +2,9 @@ FILENAME... drvESP300.cc USAGE... Motor record driver level support for Newport ESP300/100. -Version: $Revision: 1.24 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2009-04-27 14:03:02 $ +Version: $Revision: 1.25 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2009-09-01 16:17:46 $ */ /* @@ -128,7 +128,7 @@ struct driver_table ESP300_access = NULL }; -struct +struct drvESP300_drvet { long number; #ifdef __cplusplus @@ -572,7 +572,7 @@ static int motor_init() int card_index, motor_index; char buff[BUFF_SIZE]; int total_axis = 0; - int status; + int status=0; asynStatus success_rtn; static const char output_terminator[] = "\r"; static const char input_terminator[] = "\n"; diff --git a/motorApp/NewportSrc/drvMM3000.cc b/motorApp/NewportSrc/drvMM3000.cc index 25db9eb8..198a20ad 100644 --- a/motorApp/NewportSrc/drvMM3000.cc +++ b/motorApp/NewportSrc/drvMM3000.cc @@ -2,9 +2,9 @@ FILENAME... drvMM3000.cc USAGE... Motor record driver level support for Newport MM3000. -Version: $Revision: 1.21 $ +Version: $Revision: 1.22 $ Modified By: $Author: rivers $ -Last Modified: $Date: 2005-12-15 20:19:02 $ +Last Modified: $Date: 2009-09-01 16:18:09 $ */ /* @@ -151,7 +151,7 @@ struct driver_table MM3000_access = NULL }; -struct +struct drvMM3000_drvet { long number; long (*report) (int); diff --git a/motorApp/NewportSrc/drvMM4000.cc b/motorApp/NewportSrc/drvMM4000.cc index 4bd93443..ec8ab088 100644 --- a/motorApp/NewportSrc/drvMM4000.cc +++ b/motorApp/NewportSrc/drvMM4000.cc @@ -2,9 +2,9 @@ FILENAME... drvMM4000.cc USAGE... Motor record driver level support for Newport MM4000. -Version: $Revision: 1.23 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2009-02-18 20:54:20 $ +Version: $Revision: 1.24 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2009-09-01 16:18:28 $ */ /* @@ -157,7 +157,7 @@ struct driver_table MM4000_access = NULL }; -struct +struct drvMM4000_drvet { long number; #ifdef __cplusplus @@ -635,7 +635,7 @@ static int motor_init() char buff[BUFF_SIZE]; char *tok_save, *pos_ptr; int total_axis = 0; - int status, model_num, digits; + int status=0, model_num, digits; asynStatus success_rtn; initialized = true; /* Indicate that driver is initialized. */ diff --git a/motorApp/NewportSrc/drvPM500.cc b/motorApp/NewportSrc/drvPM500.cc index 9d7a6c76..5bf5f1e0 100644 --- a/motorApp/NewportSrc/drvPM500.cc +++ b/motorApp/NewportSrc/drvPM500.cc @@ -2,9 +2,9 @@ FILENAME... drvPM500.cc USAGE... Motor record driver level support for Newport PM500. -Version: $Revision: 1.21 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2009-08-25 18:25:54 $ +Version: $Revision: 1.22 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2009-09-01 16:20:08 $ */ /* Device Driver Support routines for PM500 motor controller */ @@ -141,7 +141,7 @@ struct driver_table PM500_access = PM500_axis_names }; -struct +struct drvP500_drvet { long number; #ifdef __cplusplus @@ -514,7 +514,7 @@ static int motor_init() int card_index, motor_index; char buff[BUFF_SIZE]; int total_axis = 0; - int status, digits; + int status=0, digits; asynStatus success_rtn; initialized = true; /* Indicate that driver is initialized. */ diff --git a/motorApp/NewportSrc/drvXPSAsynAux.c b/motorApp/NewportSrc/drvXPSAsynAux.c index 4e314415..f2c7f925 100644 --- a/motorApp/NewportSrc/drvXPSAsynAux.c +++ b/motorApp/NewportSrc/drvXPSAsynAux.c @@ -384,7 +384,7 @@ static asynStatus readUInt32D(void *drvPvt, asynUser *pasynUser, channel); return(asynError); } - status = GPIOAnalogGainGet(pPvt->socketID, 1, analogInputNames[channel], value); + status = GPIOAnalogGainGet(pPvt->socketID, 1, analogInputNames[channel], (int*)value); if (status) { epicsSnprintf(pasynUser->errorMessage, pasynUser->errorMessageSize, "drvXPSAsynAux::writeUInt32D error calling GPIOAnalogGainSet=%d", @@ -441,7 +441,7 @@ static asynStatus writeUInt32D(void *drvPvt, asynUser *pasynUser, return(asynError); } GPIOName = analogInputNames[channel]; - status = GPIOAnalogGainSet(pPvt->socketID, 1, GPIOName, &value); + status = GPIOAnalogGainSet(pPvt->socketID, 1, GPIOName, (int*)&value); if (status) { epicsSnprintf(pasynUser->errorMessage, pasynUser->errorMessageSize, "drvXPSAsynAux::writeUInt32D error calling GPIOAnalogGainSet=%d", diff --git a/motorApp/NewportSrc/xps_ftp.c b/motorApp/NewportSrc/xps_ftp.c index 8f079657..441ee3fd 100644 --- a/motorApp/NewportSrc/xps_ftp.c +++ b/motorApp/NewportSrc/xps_ftp.c @@ -24,7 +24,9 @@ static int code(char*); static int sendFtpCommandAndReceive (int, char*, char*); static int getPort (int, char*); +#ifdef DEBUG static void printRecv (char*, int); +#endif /******[ ftpConnect ]************************************************/ @@ -370,6 +372,7 @@ static int getPort (int socketFD, char* ip) } +#ifdef DEBUG /******[ printRecv ]**************************************************/ static void printRecv (char *str, int i) { @@ -377,3 +380,4 @@ static void printRecv (char *str, int i) for (j = 0; j < i; j++) printf("%c", str[j]); } +#endif