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

---
 motorApp/NewportSrc/SMC100Driver.cpp |  8 ++------
 motorApp/NewportSrc/XPSAxis.cpp      | 13 ++++++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/motorApp/NewportSrc/SMC100Driver.cpp b/motorApp/NewportSrc/SMC100Driver.cpp
index 7574571e..626b95ca 100644
--- a/motorApp/NewportSrc/SMC100Driver.cpp
+++ b/motorApp/NewportSrc/SMC100Driver.cpp
@@ -44,7 +44,6 @@ SMC100Controller::SMC100Controller(const char *portName, const char *SMC100PortN
 {
   int axis;
   asynStatus status;
-  SMC100Axis *pAxis;
   static const char *functionName = "SMC100Controller::SMC100Controller";
 
   /* Connect to SMC100 controller */
@@ -55,8 +54,7 @@ SMC100Controller::SMC100Controller(const char *portName, const char *SMC100PortN
       functionName);
   }
   for (axis=0; axis<numAxes; axis++) {
-  //for (axis=1; axis < (numAxes + 1); axis++) {
-    pAxis = new SMC100Axis(this, axis);
+    new SMC100Axis(this, axis);
   }
 
   startPoller(movingPollPeriod, idlePollPeriod, 2);
@@ -74,9 +72,7 @@ SMC100Controller::SMC100Controller(const char *portName, const char *SMC100PortN
 extern "C" int SMC100CreateController(const char *portName, const char *SMC100PortName, int numAxes, 
                                    int movingPollPeriod, int idlePollPeriod)
 {
-  SMC100Controller *pSMC100Controller
-    = new SMC100Controller(portName, SMC100PortName, numAxes, movingPollPeriod/1000., idlePollPeriod/1000.);
-  pSMC100Controller = NULL;
+  new SMC100Controller(portName, SMC100PortName, numAxes, movingPollPeriod/1000., idlePollPeriod/1000.);
   return(asynSuccess);
 }
 
diff --git a/motorApp/NewportSrc/XPSAxis.cpp b/motorApp/NewportSrc/XPSAxis.cpp
index 479e29c3..548230aa 100644
--- a/motorApp/NewportSrc/XPSAxis.cpp
+++ b/motorApp/NewportSrc/XPSAxis.cpp
@@ -142,7 +142,6 @@ XPSAxis::XPSAxis(XPSController *pC, int axisNo, const char *positionerName, doub
 {
   static const char *functionName = "XPSAxis";
   char *index;
-  int status;
   double minJerkTime, maxJerkTime;
 
   moveSocket_ = TCP_ConnectToServer(pC_->IPAddress_, pC->IPPort_, XPS_POLL_TIMEOUT);
@@ -186,12 +185,12 @@ XPSAxis::XPSAxis(XPSController *pC, int axisNo, const char *positionerName, doub
 
   stepSize_ = stepSize;
   /* Read some information from the controller for this axis */
-  status = PositionerSGammaParametersGet(pollSocket_,
-                                         positionerName_,
-                                         &velocity_,
-                                         &accel_,
-                                         &minJerkTime,
-                                         &maxJerkTime);
+  PositionerSGammaParametersGet(pollSocket_,
+                                positionerName_,
+                                &velocity_,
+                                &accel_,
+                                &minJerkTime,
+                                &maxJerkTime);
    setDoubleParam(pC_->XPSMinJerk_, minJerkTime);
    setDoubleParam(pC_->XPSMaxJerk_, maxJerkTime);