Fix: standardizing on pass by reference for exception handling

device_support/basler/BASLERACA.cpp

@@ -877,7 +877,7 @@ int BASLER_ACA::startFramesAcquisition()
     Data *nodeData = t0Node->getData();
     timeStamp0 = (int64_t)nodeData->getLong();
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
     sprintf(error, "%s: Error getting frame0 time\n", this->ipAddress);
   }
@@ -892,7 +892,7 @@ int BASLER_ACA::startFramesAcquisition()
       Data *nodeData = tStartOffset->getData();
       timeOffset = (float)nodeData->getFloatArray()[0];
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
       sprintf(error,
               "%s: Error getting timebaseNid (offset time set to 0.0s)\n",

device_support/basler/main.cpp

@@ -48,9 +48,9 @@ int main(int argc, char **argv)
     node = tree->getNode((char *)"\\BASLER::TOP:BASLER:FRAME0_TIME");
     frame0TimeNid = node->getNid();
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    std::cout << "ERROR reading data" << exc->what() << "\n";
+    std::cout << "ERROR reading data" << exc.what() << "\n";
   }
 
   // printf("frame node path: %s\n", node->getPath());

device_support/caen/caenInterface.cpp

@@ -200,9 +200,9 @@ class SaveItem
       deleteData(endTime);
       deleteData(segCount);
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
-      printf("Cannot put segment: %s\n", exc->what());
+      printf("Cannot put segment: %s\n", exc.what());
     }
     delete dataNode;
     delete clockNode;
@@ -366,9 +366,9 @@ extern "C" void openTree(char *name, int shot, void **treePtr)
     Tree *tree = new Tree(name, shot);
     *treePtr = (void *)tree;
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    printf("Cannot open tree %s %d: %s\n", name, shot, exc->what());
+    printf("Cannot open tree %s %d: %s\n", name, shot, exc.what());
   }
 }
 

device_support/camera_utils/cammdsutils.cpp

@@ -168,9 +168,9 @@ class SaveFrame
           metaNode->makeSegment(time, time, dim, (Array *)metaData);
         }
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        cout << "ERROR WRITING SEGMENT: " << exc->what() << "\n";
+        cout << "ERROR WRITING SEGMENT: " << exc.what() << "\n";
       }
       deleteData(data);
       deleteData(time);
@@ -196,9 +196,9 @@ class SaveFrame
       {
         dim = compileWithArgs("[$1]", (Tree *)treePtr, 1, time);
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        cout << "ERROR CompileWithArgs: " << exc->what() << "\n";
+        cout << "ERROR CompileWithArgs: " << exc.what() << "\n";
       }
 
       try
@@ -212,9 +212,9 @@ class SaveFrame
           metaNode->makeSegment(time, time, dim, (Array *)metaData);
         }
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        cout << "ERROR WRITING SEGMENT " << exc->what() << "\n";
+        cout << "ERROR WRITING SEGMENT " << exc.what() << "\n";
       }
 
       try
@@ -233,9 +233,9 @@ class SaveFrame
         else if (pixelSize <= 32)
           delete (int *)frame;
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        cout << "ERROR deleting data" << exc->what() << "\n";
+        cout << "ERROR deleting data" << exc.what() << "\n";
       }
     }
   }
@@ -426,9 +426,9 @@ int camOpenTree(char *treeName, int shot, void **treePtr)
     *treePtr = (void *)tree;
     return 0;
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    cout << "Error opening Tree " << treeName << ": " << exc->what() << "\n";
+    cout << "Error opening Tree " << treeName << ": " << exc.what() << "\n";
     return -1;
   }
 }

device_support/flir/FLIRSC65X.cpp

@@ -1972,7 +1972,7 @@ int FLIR_SC65X::startFramesAcquisition()
     Data *nodeData = t0Node->getData();
     timeStamp0 = (int64_t)nodeData->getLong();
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
     printf("Error getting frame0 time\n");
   }

device_support/flir/main.cpp

@@ -69,9 +69,9 @@ int main(int argc, char **argv)
         tree->getNode((char *)"\\CAMERATEST::TOP:POINTGRAY:FRAMES_METAD");
     dataNid = node->getNid(); // Node id to save the acquired frames
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    std::cout << "ERROR reading data" << exc->what() << "\n";
+    std::cout << "ERROR reading data" << exc.what() << "\n";
   }
 
   printf("frame node path: %s\n", node->getPath());
@@ -113,9 +113,9 @@ int main(int argc, char **argv)
     framePtr = (frameData)->getShortArray(dataDims);
     framePtrMeta = (frameDataMeta)->getByteArray(dataDimsMeta);
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    std::cout << "ERROR reading data" << exc->what() << "\n";
+    std::cout << "ERROR reading data" << exc.what() << "\n";
   }
 
   FLIR_SC65X *FlirCam;

device_support/national/AsyncStoreManager.cpp

@@ -126,7 +126,7 @@ void SaveItem::save()
         delete[] samples;
         delete[] times;
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         printf("Cannot convert stream sample: %s\n", exc.what());
       }
@@ -221,7 +221,7 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
           else
             dataNode->beginSegment(startTime, endTime, dim, fData);
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           printf("BEGIN SEGMENT FAILED FOR NODE %s: %s\n",
                  dataNode->getFullPath(), exc.what());
@@ -245,7 +245,7 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
           else
             dataNode->beginSegment(startTime, endTime, dim, fData);
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           printf("BEGIN SEGMENT FAILED FOR NODE %s: %s\n",
                  dataNode->getFullPath(), exc.what());
@@ -280,7 +280,7 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
           else
             dataNode->putSegment(data, -1);
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           printf("PUT SEGMENT FAILED FOR NODE: %s: %s\n", dataNode->getFullPath(),
                  exc.what());
@@ -302,7 +302,7 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
           else
             dataNode->putSegment(data, -1);
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           printf("PUT SEGMENT FAILED FOR NODE: %s: %s\n", dataNode->getFullPath(),
                  exc.what());
@@ -317,9 +317,9 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
       /* Send Event on Segment update <TreeName>_<DeviceNodeName>_CH<numchannel>*/
       // sendChannelSegmentPutEvent(dataNode);
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
-      printf("Cannot put segment: %s\n", exc->what());
+      printf("Cannot put segment: %s\n", exc.what());
     }
     delete clockNode;
   }

device_support/national/AsyncStoreManager.h

@@ -87,9 +87,9 @@ class SaveItem
               (tokens[1].substr(8)).data());
       Event::setevent(event);
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
-      printf("Send Event Error: %s\n", exc->what());
+      printf("Send Event Error: %s\n", exc.what());
     }
   }
 

device_support/national/NiInterface.cpp

@@ -267,9 +267,9 @@ void openTree(char *name, int shot, void **treePtr)
     *treePtr = (void *)tree;
     TreeNode *n = tree->getNode("\\TOP");
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    printf("Cannot open tree %s %d: %s\n", name, shot, exc->what());
+    printf("Cannot open tree %s %d: %s\n", name, shot, exc.what());
   }
 }
 
@@ -279,9 +279,9 @@ void closeTree(void *treePtr)
   {
     delete ((Tree *)treePtr);
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    printf("Cannot close tree %s %d: %s\n", exc->what());
+    printf("Cannot close tree %s %d: %s\n", exc.what());
   }
 }
 
@@ -577,7 +577,7 @@ int xseriesReadAndSaveAllChannels(int aiFd, int nChan, void *chanFdPtr,
         Data *streamGainData = dataNode->getExtendedAttribute("STREAM_GAIN");
         streamGains[chan] = streamGainData->getFloat();
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         streamGains[chan] = 1;
       }
@@ -587,12 +587,12 @@ int xseriesReadAndSaveAllChannels(int aiFd, int nChan, void *chanFdPtr,
             dataNode->getExtendedAttribute("STREAM_OFFSET");
         streamOffsets[chan] = streamOffsetData->getFloat();
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         streamOffsets[chan] = 0;
       }
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       streamNames[chan] = NULL;
       streamGains[chan] = 0;
@@ -616,7 +616,7 @@ int xseriesReadAndSaveAllChannels(int aiFd, int nChan, void *chanFdPtr,
       coeffs[chanIdx] = rangeData->getFloatArray(&numCoeffs[chanIdx]);
       deleteData(rangeData);
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("%s\n", exc.what());
     }
@@ -927,7 +927,7 @@ int pxi6259_readAndSaveAllChannels(
           Data *streamGainData = currNode->getExtendedAttribute("STREAM_GAIN");
           streamGains[i] = streamGainData->getFloat();
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           streamGains[i] = 1;
         }
@@ -937,12 +937,12 @@ int pxi6259_readAndSaveAllChannels(
               currNode->getExtendedAttribute("STREAM_OFFSET");
           streamOffsets[i] = streamOffsetData->getFloat();
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           streamOffsets[i] = 0;
         }
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         streamNames[i] = NULL;
         streamGains[i] = 0;
@@ -956,7 +956,7 @@ int pxi6259_readAndSaveAllChannels(
         delete currNode;
       }
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("Error deleting data nodes\n");
     }
@@ -1719,9 +1719,9 @@ int temperatureProbeControl(uint32_t boardID, uint32_t *inChan, int numChan,
     errorNode = t->getNode((char *)"\\IPP_TC_TREND::ERROR");
     vRefNode = t->getNode((char *)"\\IPP_TC_TREND::VREF");
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    printf("%s\n", exc->what());
+    printf("%s\n", exc.what());
     return -1;
   }
 
@@ -1866,9 +1866,9 @@ int temperatureProbeControl(uint32_t boardID, uint32_t *inChan, int numChan,
         currData = new Float32(vRef);
         vRefNode->putRow(currData, &currTime);
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        printf("%s\n", exc->what());
+        printf("%s\n", exc.what());
         error = 1;
         goto out;
       }
@@ -2723,7 +2723,7 @@ class SaveItemEV
         MDSplus::deleteData(endData);
         MDSplus::deleteData(dimData);
       }
-      catch (MDSplus::MdsException &exc)
+      catch (const MDSplus::MdsException &exc)
       {
         std::cout << "Error in BeginSegment: " << exc.what() << std::endl;
       }
@@ -2738,7 +2738,7 @@ class SaveItemEV
         MDSplus::deleteData(dimData);
         MDSplus::deleteData(segData);
       }
-      catch (MDSplus::MdsException &exc)
+      catch (const MDSplus::MdsException &exc)
       {
         std::cout << "Error in MakeSegment: " << exc.what() << std::endl;
       }
@@ -2752,7 +2752,7 @@ class SaveItemEV
         MDSplus::deleteData(endData);
         MDSplus::deleteData(dimData);
       }
-      catch (MDSplus::MdsException &exc)
+      catch (const MDSplus::MdsException &exc)
       {
         std::cout << "Error in UpdateSegment: " << exc.what() << std::endl;
       }
@@ -2764,7 +2764,7 @@ class SaveItemEV
         node->putSegment(segData, -1);
         MDSplus::deleteData(segData);
       }
-      catch (MDSplus::MdsException &exc)
+      catch (const MDSplus::MdsException &exc)
       {
         std::cout << "Error in PutSegment: " << exc.what() << std::endl;
       }
@@ -3525,7 +3525,7 @@ int pxi6259EV_readAndSaveAllChannels(
       treeNodes[i] = new TreeNode(dataNid[i], (Tree *)treePtr);
       treeNodes[i]->deleteData();
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("Error deleting data nodes\n");
     }
@@ -3669,7 +3669,7 @@ int pxi6368EV_readAndSaveAllChannels(
       treeNodes[i] = new TreeNode(dataNid[i], (Tree *)treePtr);
       treeNodes[i]->deleteData();
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("Error deleting data nodes\n");
     }
@@ -3696,7 +3696,7 @@ int pxi6368EV_readAndSaveAllChannels(
       coeffs[chan] = rangeData->getFloatArray(&numCoeffs[chan]);
       deleteData(rangeData);
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("%s\n", exc.what());
     }