From f4d84cdd4f4458d3e10fbb88fb600afb71cd2298 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Wed, 17 Jun 2015 19:01:18 -0700 Subject: [PATCH] Fixed potentially uninitialized value warnings emitted by clang Removed unused variable from DigitalInput class Removed extraneous explicit std::string conversions in Preferences class Change-Id: Ia445abfd136a7b3e7f0491ed22aaa057814bcc8f --- wpilibc/wpilibC++Devices/include/DigitalInput.h | 1 - wpilibc/wpilibC++Devices/src/CANJaguar.cpp | 6 +++--- wpilibc/wpilibC++Devices/src/Preferences.cpp | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/wpilibc/wpilibC++Devices/include/DigitalInput.h b/wpilibc/wpilibC++Devices/include/DigitalInput.h index a6c69a954a..d019fba1a8 100644 --- a/wpilibc/wpilibC++Devices/include/DigitalInput.h +++ b/wpilibc/wpilibC++Devices/include/DigitalInput.h @@ -40,7 +40,6 @@ class DigitalInput : public DigitalSource, public LiveWindowSendable { private: uint32_t m_channel; - bool m_lastValue; ITable *m_table = nullptr; }; diff --git a/wpilibc/wpilibC++Devices/src/CANJaguar.cpp b/wpilibc/wpilibC++Devices/src/CANJaguar.cpp index 2bad4a0daf..c99994baf9 100644 --- a/wpilibc/wpilibC++Devices/src/CANJaguar.cpp +++ b/wpilibc/wpilibC++Devices/src/CANJaguar.cpp @@ -663,7 +663,7 @@ void CANJaguar::verify() { } if (!m_pVerified) { - uint32_t message; + uint32_t message = 0; if (m_controlMode == kSpeed) message = LM_API_SPD_PC; @@ -693,7 +693,7 @@ void CANJaguar::verify() { } if (!m_iVerified) { - uint32_t message; + uint32_t message = 0; if (m_controlMode == kSpeed) message = LM_API_SPD_IC; @@ -723,7 +723,7 @@ void CANJaguar::verify() { } if (!m_dVerified) { - uint32_t message; + uint32_t message = 0; if (m_controlMode == kSpeed) message = LM_API_SPD_DC; diff --git a/wpilibc/wpilibC++Devices/src/Preferences.cpp b/wpilibc/wpilibC++Devices/src/Preferences.cpp index e7d395820e..75754eb873 100644 --- a/wpilibc/wpilibC++Devices/src/Preferences.cpp +++ b/wpilibc/wpilibC++Devices/src/Preferences.cpp @@ -336,9 +336,9 @@ std::string Preferences::Get(const char *key) { Synchronized sync(m_tableLock); if (key == nullptr) { wpi_setWPIErrorWithContext(NullParameter, "key"); - return std::string(""); + return ""; } - return m_values[std::string(key)]; + return m_values[key]; } /**