From 723df69943cf69662b9c9c8afcabe7a076641e35 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 31 Dec 2017 03:16:30 +0100 Subject: [PATCH] BFM and DSD demod: gcc7 warnings fixes --- plugins/channelrx/demodbfm/rdsparser.cpp | 4 ++-- plugins/channelrx/demoddsd/dsddemodgui.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/channelrx/demodbfm/rdsparser.cpp b/plugins/channelrx/demodbfm/rdsparser.cpp index 2fa8e1360..d4a34bc2d 100644 --- a/plugins/channelrx/demodbfm/rdsparser.cpp +++ b/plugins/channelrx/demodbfm/rdsparser.cpp @@ -933,10 +933,10 @@ void RDSParser::decode_optional_content(int no_groups, unsigned long int *free_f while(ff_pointer > 0) { ff_pointer -= 4; - m_g8_label_index = (free_format[i] && (0xf << ff_pointer)); + m_g8_label_index = (free_format[i] & (0xf << ff_pointer)); content_length = optional_content_lengths[m_g8_label_index]; ff_pointer -= content_length; - m_g8_content = (free_format[i] && (int(std::pow(2, content_length) - 1) << ff_pointer)); + m_g8_content = (free_format[i] & (int(std::pow(2, content_length) - 1) << ff_pointer)); /* qDebug() << "RDSParser::decode_optional_content: TMC optional content (" << label_descriptions[m_g8_label_index].c_str() diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index e74e2e6d1..de4f49d29 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -527,11 +527,11 @@ void DSDDemodGUI::formatStatusText() strncpy(&m_formatStatusText[14], "---", 82-14); } - char dest[11]; + char dest[12]; if ( m_dsdDemod->getDecoder().getYSFDecoder().radioIdMode()) { - snprintf(dest, 10, "%-5s:%-5s", + snprintf(dest, 11, "%-5s:%-5s", m_dsdDemod->getDecoder().getYSFDecoder().getDestId(), m_dsdDemod->getDecoder().getYSFDecoder().getSrcId()); }