Fixed a bunch of static analysis warnings, some redundant variables, and a potential null dereference

Author: azonenberg

lib

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2025 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -337,7 +337,11 @@ bool ProtocolAnalyzerDialog::DoRender()
 					ImVec2(0, 0)))
 				{
 					m_selectedPacket = pack;
+
+					//row is now selected, we may or may not do something with this flag but write it for consistency
+					//cppcheck-suppress deadcode.DeadStores
 					rowIsSelected = true;
+
 					visibleRowSelected = true;
 
 					//See if a new waveform was selected

src/ngscopeclient/ProtocolAnalyzerDialog.cpp

@@ -855,7 +855,7 @@ bool Session::LoadWaveformDataForScope(
 	return true;
 }
 
-void Session::DoLoadWaveformDataForStream(WaveformBase* cap, string format, string fname)
+void Session::DoLoadWaveformDataForStream(WaveformBase* cap, const string& format, const string& fname)
 {
 	auto sacap = dynamic_cast<SparseAnalogWaveform*>(cap);
 	auto uacap = dynamic_cast<UniformAnalogWaveform*>(cap);

src/ngscopeclient/Session.cpp

@@ -422,7 +422,7 @@ class Session
 		int version,
 		const YAML::Node& node,
 		const std::string& dataDir);
-	void DoLoadWaveformDataForStream(WaveformBase* cap, std::string format, std::string fname);
+	void DoLoadWaveformDataForStream(WaveformBase* cap, const std::string& format, const std::string& fname);
 	bool ConvertLegacyUniformWaveforms();
 
 	///@brief Version of the file being loaded

src/ngscopeclient/Session.h

@@ -689,7 +689,7 @@ void StreamBrowserDialog::renderDmmProperties(std::shared_ptr<Multimeter> dmm, M
 	int modeSelector = 0;
 	for(unsigned int i=0; i<32; i++)
 	{
-		auto mode = static_cast<Multimeter::MeasurementTypes>(1 << i);
+		auto mode = static_cast<Multimeter::MeasurementTypes>(1U << i);
 		if(modemask & mode)
 		{
 			modes.push_back(mode);
@@ -1339,8 +1339,13 @@ void StreamBrowserDialog::DoFrequencySettings(shared_ptr<Oscilloscope> scope)
 void StreamBrowserDialog::DoSpectrometerSettings(shared_ptr<SCPISpectrometer> spec)
 {
 	auto scope = dynamic_pointer_cast<SCPIOscilloscope>(spec);
+
+	//Create the object only when necessary
+	//cppcheck doesn't like this but doesn't realize we're creating a new object if it's not there already
+	//cppcheck-suppress stlFindInsert
 	if(m_timebaseConfig.find(scope) == m_timebaseConfig.end())
 		m_timebaseConfig[scope] = make_shared<StreamBrowserTimebaseInfo>(scope);
+
 	auto config = m_timebaseConfig[scope];
 
 	auto width = ImGui::GetFontSize() * 5;

src/ngscopeclient/StreamBrowserDialog.cpp

@@ -154,7 +154,7 @@ void TriggerPropertiesPage::Render(bool graphEditorMode)
 				}
 
 				//The actual combo box
-				if(Dialog::Combo(trig->GetInputName(i).c_str(), names, sel))
+				if(Dialog::Combo(trig->GetInputName(i), names, sel))
 				{
 					trig->SetInput(i, matchingInputs[sel]);
 					updated = true;
@@ -262,8 +262,7 @@ void TriggerPropertiesPage::FindAllStreams(vector<StreamDescriptor>& streams)
 // Construction / destruction
 
 TriggerPropertiesDialog::TriggerPropertiesDialog(Session* session)
-	: Dialog("Trigger", "Trigger", ImVec2(300, 400))
-	, m_session(session)
+	: Dialog("Trigger", "Trigger", ImVec2(300, 400), session)
 {
 	Refresh();
 }

src/ngscopeclient/TriggerPropertiesDialog.cpp

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -76,8 +76,6 @@ class TriggerPropertiesDialog : public Dialog
 	virtual bool DoRender();
 
 protected:
-	Session* m_session;
-
 	std::vector<std::unique_ptr<TriggerPropertiesPage>> m_pages;
 	std::vector<int> m_triggerTypeIndexes;
 };

src/ngscopeclient/TriggerPropertiesDialog.h

@@ -1502,6 +1502,10 @@ void WaveformArea::RenderSpectrumPeaks(ImDrawList* list, shared_ptr<DisplayedCha
 			else
 				npeak.m_labelYpos = p.m_y - PixelsToYAxisUnits(3*ImGui::GetFontSize());
 
+			//Default sizes to 0 until we render it, just so we don't have uninitialized junk floating around
+			npeak.m_labelXsize = 0;
+			npeak.m_labelYsize = 0;
+
 			//Default to 100% alpha
 			npeak.m_peakAlpha = 255;
 
@@ -3078,13 +3082,11 @@ void WaveformArea::CheckForScaleMismatch(ImVec2 start, ImVec2 size)
 	//If the mismatched stream isn't part of a scope, don't bother showing any warnings etc
 	//Filters can't be overdriven, so just silently clip
 	auto ochan = dynamic_cast<OscilloscopeChannel*>(mismatchStream.m_channel);
-	Oscilloscope* scope = nullptr;
-	if(ochan)
-	{
-		scope = ochan->GetScope();
-		if(!scope)
-			return;
-	}
+	if(!ochan)
+		return;
+	auto scope = ochan->GetScope();
+	if(!scope)
+		return;
 
 	//If we get here, we had a mismatch. Prepare to draw the warning message centered in the plot
 	//above everything else
@@ -4138,7 +4140,7 @@ void WaveformArea::ChannelButton(shared_ptr<DisplayedChannel> chan, size_t index
 				ImVec2 gradsize(8*height, height);
 
 				auto list = ImGui::GetWindowDrawList();
-				for(auto internalName : gradients)
+				for(auto& internalName : gradients)
 				{
 					auto displayName = m_parent->GetEyeGradientFriendlyName(internalName);
 

src/ngscopeclient/WaveformArea.cpp

@@ -58,8 +58,11 @@ class Session;
 class InstrumentThreadArgs
 {
 public:
+
 	InstrumentThreadArgs(std::shared_ptr<SCPIInstrument> p, Session* sess)
 	: inst(p)
+	, shuttingDown(nullptr)	//initialize here to avoid static analysis warning, but must be overwritten
+							//with a valid shutdown flag pointer before spawning the InstrumentThread
 	, session(sess)
 	{}