Merge pull request #3354 from BsAtHome/fix_cppcheck-various

Fix various cppcheck indicated errors and warnings

Author: andypugh

src/emc/motion/homing.c

@@ -37,8 +37,8 @@ void homeMotFunctions(void(*pSetRotaryUnlock)(int,int)
                      ,int (*pGetRotaryIsUnlocked)(int)
                      )
 {
-    SetRotaryUnlock     = *pSetRotaryUnlock;
-    GetRotaryIsUnlocked = *pGetRotaryIsUnlocked;
+    SetRotaryUnlock     = pSetRotaryUnlock;
+    GetRotaryIsUnlocked = pGetRotaryIsUnlocked;
 }
 
 //========================================================

src/emc/motion/stashf_wrap.h

@@ -91,7 +91,10 @@ const char *fmt, *efmt;
     if(*fmt) {
         result = PRINT("%s", fmt);
         if(result < 0) return SET_ERRNO(result);
-        EXTRA
+        // The below expansion of 'EXTRA' makes no sense. The function is about
+        // to exit and changing anything here does not change the outcome in
+        // any way. Therefore, make it a comment.
+        // EXTRA
     }
 
     return SET_ERRNO(result);

src/emc/pythonplugin/python_plugin.hh

@@ -70,8 +70,8 @@ public:
     int plugin_status() { return status; };
     bool usable() { return (status >= PLUGIN_OK); }
     int initialize();
-    std::string last_exception() { return exception_msg; };
-    std::string last_errmsg() { return error_msg; };
+    const std::string& last_exception() { return exception_msg; };
+    const std::string& last_errmsg() { return error_msg; };
     boost::python::object main_namespace;
 
 private:

src/emc/rs274ngc/interp_python.cc

@@ -293,6 +293,8 @@ pycontext::~pycontext() { delete impl; }
 pycontext::pycontext(const pycontext &other)
     : impl(new pycontext_impl(*other.impl)) {}
 pycontext &pycontext::operator=(const pycontext &other) {
+    if(&other == this)  // Assign to self
+        return *this;
     delete impl;
     impl = new pycontext_impl(*other.impl);
     return *this;

src/emc/rs274ngc/rs274ngc_pre.cc

@@ -1953,6 +1953,13 @@ int Interp::save_parameters(const char *filename,      //!< name of file to writ
   infile = fopen(filename, "r");
   if(!infile)
     infile = fopen("/dev/null", "r");
+  if(!infile) {
+    // If we can't open the 'filename', we may not be able to open "/dev/null"
+    // either. If so, print an error, close 'outfile' and continue.
+    perror("Interp::save_parameters(): fopen(/dev/null)");
+    fclose(outfile);
+    return INTERP_OK;
+  }
 
   k = 0;
   index = 0;

src/emc/sai/saicanon.cc

@@ -315,8 +315,8 @@ void STOP_SPEED_FEED_SYNCH()
 void NURBS_G5_FEED(int /*lineno*/, const std::vector<NURBS_CONTROL_POINT>& nurbs_control_points, unsigned int /*nurbs_order*/, CANON_PLANE /*plane*/) {
   ECHO_WITH_ARGS("%lu, ...", (unsigned long)nurbs_control_points.size());
 
-  _sai._program_position_x = nurbs_control_points[nurbs_control_points.size()].NURBS_X;
-  _sai._program_position_y = nurbs_control_points[nurbs_control_points.size()].NURBS_Y;
+  _sai._program_position_x = nurbs_control_points[nurbs_control_points.size()-1].NURBS_X;
+  _sai._program_position_y = nurbs_control_points[nurbs_control_points.size()-1].NURBS_Y;
 }
 
 /* Machining Functions G_6_2 */
@@ -325,8 +325,8 @@ void NURBS_G6_FEED(int /*lineno*/, const std::vector<NURBS_G6_CONTROL_POINT>& nu
   print_nc_line_number();
   fprintf(_outfile, "saicanon NURBS_G6_FEED_(%lu, ...)\n", (unsigned long)nurbs_control_points.size());
 
-  _sai._program_position_x = nurbs_control_points[nurbs_control_points.size()].NURBS_X;
-  _sai._program_position_y = nurbs_control_points[nurbs_control_points.size()].NURBS_Y;
+  _sai._program_position_x = nurbs_control_points[nurbs_control_points.size()-1].NURBS_X;
+  _sai._program_position_y = nurbs_control_points[nurbs_control_points.size()-1].NURBS_Y;
 }
 
 void ARC_FEED(int /*line_number*/,

src/emc/task/taskclass.hh

@@ -54,6 +54,10 @@ public:
     Task(EMC_IO_STAT &emcioStatus_in);
     virtual ~Task();
 
+    // Don't copy or assign
+    Task(const Task&) = delete;
+    Task& operator=(const Task&) = delete;
+
     virtual int emcIoInit();
     virtual int emcIoAbort(EMC_ABORT reason);
     virtual int emcAuxEstopOn();

src/emc/tp/tp.c

@@ -82,12 +82,12 @@ void tpMotFunctions(void(  *pDioWrite)(int,char)
                    ,double(*paxis_get_acc_limit)(int)
                    )
 {
-    _DioWrite            = *pDioWrite;
-    _AioWrite            = *pAioWrite;
-    _SetRotaryUnlock     = *pSetRotaryUnlock;
-    _GetRotaryIsUnlocked = *pGetRotaryIsUnlocked;
-    _axis_get_vel_limit  = *paxis_get_vel_limit;
-    _axis_get_acc_limit  = *paxis_get_acc_limit;
+    _DioWrite            = pDioWrite;
+    _AioWrite            = pAioWrite;
+    _SetRotaryUnlock     = pSetRotaryUnlock;
+    _GetRotaryIsUnlocked = pGetRotaryIsUnlocked;
+    _axis_get_vel_limit  = paxis_get_vel_limit;
+    _axis_get_acc_limit  = paxis_get_acc_limit;
 }
 
 void tpMotData(emcmot_status_t *pstatus

src/emc/usr_intf/emcrsh.cc

@@ -1839,7 +1839,7 @@ static cmdResponseType getBrake(connectionRecType *context)
         if (n != spindle && spindle != -1)
             continue;
 
-        if (emcStatus->motion.spindle[spindle].brake == 1)
+        if (emcStatus->motion.spindle[n].brake == 1)
             OUT(pBrakeStr, "ON");
         else
             OUT(pBrakeStr, "OFF");

src/emc/usr_intf/emcsched.cc

@@ -74,9 +74,9 @@ class SchedEntry {
     void setOffsets(float x, float y, float z);
     int getZone() const;
     void setZone(int z);
-    string getFileName() const;
+    const string& getFileName() const;
     void setFileName(const string& s);
-    string getProgramName() const;
+    const string& getProgramName() const;
     void setProgramName(const string& s);
     float getFeedOverride() const;
     void setFeedOverride(float f);
@@ -146,15 +146,15 @@ void SchedEntry::setZone(int z) {
   zone = z;
   }
 
-string SchedEntry::getFileName() const {
+const string& SchedEntry::getFileName() const {
   return fileName;
   }
 
 void SchedEntry::setFileName(const string& s) {
   fileName = s;
   }
 
-string SchedEntry::getProgramName() const {
+const string& SchedEntry::getProgramName() const {
   return programName;
   }
 
@@ -369,7 +369,7 @@ int getProgramById(int id, qRecType *qRec) {
   for (i=q.begin(); i!=q.end(); ++i) {
     if (i->getTagId() == id) break;
     }
-  if (i->getTagId() != id) return -1;
+  if (i == q.end() || i->getTagId() != id) return -1;
   qRec->priority = i->getPriority();
   qRec->tagId = i->getTagId();
   i->getOffsets(qRec->xpos, qRec->ypos, qRec->zpos);
@@ -384,14 +384,11 @@ int getProgramById(int id, qRecType *qRec) {
 
 int getProgramByIndex(int idx, qRecType *qRec) {
   list<SchedEntry>::iterator i;
-  int index;
 
-  if ((unsigned int) idx >= q.size()) return -1;
-  index = 0;
-  for (i=q.begin(); i!=q.end(); ++i) {
-    if (index == idx) break;
-    index++;
-    }
+  for(i = q.begin(); idx > 0; ++i) {
+    if(i == q.end()) return -1;  // return if idx was larger than number of entries
+    --idx;
+  }
   qRec->priority = i->getPriority();
   qRec->tagId = i->getTagId();
   i->getOffsets(qRec->xpos, qRec->ypos, qRec->zpos);