VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-05 22:57:47 -04:00
Code Issues Projects Releases Wiki Activity

BFM and DSD demod: gcc7 warnings fixes

Browse Source
This commit is contained in:
f4exb 2017-12-31 03:16:30 +01:00
parent c23894e567
commit 723df69943
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/channelrx/demodbfm/rdsparser.cpp
View File

@ -933,10 +933,10 @@ void RDSParser::decode_optional_content(int no_groups, unsigned long int *free_f
while(ff_pointer > 0) while(ff_pointer > 0)
{ {
ff_pointer -= 4; 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]; content_length = optional_content_lengths[m_g8_label_index];
ff_pointer -= content_length; 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() qDebug() << "RDSParser::decode_optional_content: TMC optional content (" << label_descriptions[m_g8_label_index].c_str()

4
plugins/channelrx/demoddsd/dsddemodgui.cpp
View File

@ -527,11 +527,11 @@ void DSDDemodGUI::formatStatusText()
strncpy(&m_formatStatusText[14], "---", 82-14); strncpy(&m_formatStatusText[14], "---", 82-14);
} }
char dest[11]; char dest[12];
if ( m_dsdDemod->getDecoder().getYSFDecoder().radioIdMode()) 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().getDestId(),
m_dsdDemod->getDecoder().getYSFDecoder().getSrcId()); m_dsdDemod->getDecoder().getYSFDecoder().getSrcId());
} }