From f7b0acd749e526ee1177b8290831181903276cee Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 21 Apr 2016 15:21:39 +0100 Subject: [PATCH] Convert network data to pass std::strings to the display. --- DMRSlot.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 505a9bf..38cdc4e 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -728,7 +728,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) std::string src = m_lookup->find(m_netLC->getSrcId()); std::string dst = m_lookup->find(m_netLC->getDstId()); - m_display->writeDMR(m_slotNo, src.c_str(), m_netLC->getFLCO() == FLCO_GROUP, dst.c_str(), "N"); + m_display->writeDMR(m_slotNo, src, m_netLC->getFLCO() == FLCO_GROUP, dst, "N"); #if defined(DUMP_DMR) openFile(); @@ -846,7 +846,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) std::string src = m_lookup->find(srcId); std::string dst = m_lookup->find(dstId); - m_display->writeDMR(m_slotNo, src.c_str(), gi, dst.c_str(), "N"); + m_display->writeDMR(m_slotNo, src, gi, dst, "N"); LogMessage("DMR Slot %u, received network data header from %s to %s%s, %u blocks", m_slotNo, src.c_str(), gi ? "TG ": "", dst.c_str(), m_netFrames); } else if (dataType == DT_VOICE_SYNC) { @@ -874,7 +874,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) std::string src = m_lookup->find(m_netLC->getSrcId()); std::string dst = m_lookup->find(m_netLC->getDstId()); - m_display->writeDMR(m_slotNo, src.c_str(), m_netLC->getFLCO() == FLCO_GROUP, dst.c_str(), "N"); + m_display->writeDMR(m_slotNo, src, m_netLC->getFLCO() == FLCO_GROUP, dst, "N"); LogMessage("DMR Slot %u, received network late entry from %s to %s%s", m_slotNo, src.c_str(), m_netLC->getFLCO() == FLCO_GROUP ? "TG " : "", dst.c_str()); }