From 44e5cb2effb55ea102e34729ac5954d983ccf838 Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Thu, 6 Dec 2012 22:20:02 +0000
Subject: [PATCH] Minor changes to avoid compiler warnings

---
 motorApp/NewportSrc/devMM4000.cc    | 2 +-
 motorApp/NewportSrc/drvMM4000.cc    | 4 ++--
 motorApp/NewportSrc/drvMM4000Asyn.c | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/motorApp/NewportSrc/devMM4000.cc b/motorApp/NewportSrc/devMM4000.cc
index b72de2a4..be3f3587 100644
--- a/motorApp/NewportSrc/devMM4000.cc
+++ b/motorApp/NewportSrc/devMM4000.cc
@@ -162,7 +162,7 @@ STATIC RTN_STATUS MM4000_build_trans(motor_cmnd command, double *parms, struct m
     struct MMcontroller *cntrl;
     char buff[110];
     int axis, card, maxdigits;
-    unsigned int size;
+    size_t size;
     double dval, cntrl_units;
     RTN_STATUS rtnval;
 
diff --git a/motorApp/NewportSrc/drvMM4000.cc b/motorApp/NewportSrc/drvMM4000.cc
index b106aef3..d9462f4a 100644
--- a/motorApp/NewportSrc/drvMM4000.cc
+++ b/motorApp/NewportSrc/drvMM4000.cc
@@ -515,7 +515,7 @@ exit:
 static RTN_STATUS send_mess(int card, char const *com, char *name)
 {
     struct MMcontroller *cntrl;
-    int size;
+    size_t size;
     size_t nwrite;
 
     size = strlen(com);
@@ -591,7 +591,7 @@ static int recv_mess(int card, char *com, int flag)
     }
 
     Debug(2, "recv_mess(): message = \"%s\" on card #%d\n", com, card);
-    return(nread);
+    return((int)nread);
 }
 
 
diff --git a/motorApp/NewportSrc/drvMM4000Asyn.c b/motorApp/NewportSrc/drvMM4000Asyn.c
index b35d87a7..c5f6bd26 100644
--- a/motorApp/NewportSrc/drvMM4000Asyn.c
+++ b/motorApp/NewportSrc/drvMM4000Asyn.c
@@ -401,7 +401,6 @@ static int motorAxisSetDouble(AXIS_HDL pAxis, motorAxisParam_t function, double
 static int motorAxisSetInteger(AXIS_HDL pAxis, motorAxisParam_t function, int value)
 {
     int ret_status = MOTOR_AXIS_ERROR;
-    int status;
     char buff[100];
 
     if (pAxis == NULL)
@@ -450,7 +449,7 @@ static int motorAxisSetInteger(AXIS_HDL pAxis, motorAxisParam_t function, int va
     }
     if (ret_status != MOTOR_AXIS_ERROR)
     {
-        status = motorParam->setInteger(pAxis->params, function, value);
+        motorParam->setInteger(pAxis->params, function, value);
         motorParam->callCallback(pAxis->params);
     }
     epicsMutexUnlock(pAxis->mutexId);
@@ -915,7 +914,7 @@ int MM4000AsynConfig(int card,             /* Controller number */
 
 static int sendOnly(MM4000Controller *pController, char *outputBuff)
 {
-    int nRequested=strlen(outputBuff);
+    size_t nRequested=strlen(outputBuff);
     size_t nActual;
     asynStatus status;
 
@@ -944,7 +943,7 @@ static int sendOnly(MM4000Controller *pController, char *outputBuff)
 
 static asynStatus sendAndReceive(MM4000Controller *pController, char *outputBuff, char *inputBuff, int inputSize)
 {
-    int nWriteRequested=strlen(outputBuff);
+    size_t nWriteRequested=strlen(outputBuff);
     size_t nWrite, nRead;
     int eomReason;
     asynStatus status;