Fixing fragile code pointed out by static analysis.

mwoehlke-kitware · Nov 15, 2014 · 565cf07 · 565cf07
1 parent f302e3d
commit 565cf07
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/vrpn_Button.C b/vrpn_Button.C
@@ -657,6 +657,7 @@ vrpn_Button_Python::vrpn_Button_Python(const char *name, vrpn_Connection *c,
 vrpn_Button_Python::vrpn_Button_Python(const char *name, vrpn_Connection *c,
                                        int p, unsigned ph)
     : vrpn_Button_Parallel(name, c, p, ph)
+    , d_first_fail(true)
 {
 }
 

diff --git a/vrpn_DevInput.C b/vrpn_DevInput.C
@@ -32,8 +32,6 @@ VRPN_SUPPRESS_EMPTY_OBJECT_WARNING()
 static const std::string &getDeviceNodes(const std::string &device_name) {
   std::map<std::string, std::string> s_devicesNodes;
 
-  std::string none_found="";
-
   bool permission_missing = false;
   unsigned int id = 0;
   while (1) {
@@ -64,7 +62,7 @@ static const std::string &getDeviceNodes(const std::string &device_name) {
     return node_name->second;
   }
 
-  return none_found;
+  return "";
 }
 
 ///////////////////////////////////////////////////////////////////////////

diff --git a/vrpn_YEI_3Space.C b/vrpn_YEI_3Space.C
@@ -79,6 +79,8 @@ vrpn_YEI_3Space_Sensor::vrpn_YEI_3Space_Sensor (const char * p_name
     }
   }
 
+  vrpn_gettimeofday(&timestamp, NULL);
+
   // Set the mode to reset
   d_status = STATUS_RESETTING;
 }

diff --git a/vrpn_inertiamouse.C b/vrpn_inertiamouse.C
@@ -158,7 +158,7 @@ int vrpn_inertiamouse::get_report(void)
             packet |= (buffer_[++nextchar] & 0xf0) >> 4;
 
             int chnl = (packet >> 10) & 7;
-            if (chnl > Channels) {
+            if (chnl >= Channels) {
                status_ = STATUS_SYNCING;
                send_text_message("vrpn_inertiamouse: Too-large channel value", 
 		  timestamp, 
@@ -175,7 +175,7 @@ int vrpn_inertiamouse::get_report(void)
 //            normval *= 1.5;
 
             // update rotation data
-            if (chnl == 4 || chnl == 5) {
+            if ( (chnl == 4) || (chnl == 5) ) {
                 channel[chnl] = normval;
                 break;
             }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
       }
+      vrpn_gettimeofday(&timestamp, NULL);
       // Set the mode to reset
       d_status = STATUS_RESETTING;
     }
@@ Expand Down @@