From 35629f87085720f499e7ffc9f10d5b7067750118 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 28 Nov 2017 21:35:25 +0000 Subject: [PATCH] Remove compilation warnings. --- DMRSlot.cpp | 5 +++-- JitterBuffer.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index d049450..7d37a4e 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1640,7 +1640,7 @@ void CDMRSlot::logGPSPosition(const unsigned char* data) { unsigned int errorI = (data[2U] & 0x0E) >> 1U; - char* error; + const char* error; switch (errorI) { case 0U: error = "< 2m"; @@ -1664,7 +1664,8 @@ void CDMRSlot::logGPSPosition(const unsigned char* data) error = "> 200km"; break; default: - return; + error = "not known"; + break; } int32_t longitudeI = ((data[2U] & 0x01U) << 31) | (data[3U] << 23) | (data[4U] << 15) | (data[5U] << 7); diff --git a/JitterBuffer.cpp b/JitterBuffer.cpp index cc9cb20..4a29f07 100644 --- a/JitterBuffer.cpp +++ b/JitterBuffer.cpp @@ -32,11 +32,11 @@ m_debug(debug), m_blockCount(0U), m_timer(1000U, 0U, jitterTime), m_stopWatch(), +m_running(false), m_buffer(NULL), m_headSequenceNumber(0U), m_lastData(NULL), -m_lastDataLength(0U), -m_running(false) +m_lastDataLength(0U) { assert(blockSize > 0U); assert(blockTime > 0U);