aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/MuxElements.cpp2
-rw-r--r--src/dabOutput/edi/TagPacket.cpp7
2 files changed, 3 insertions, 6 deletions
diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp
index 4bd82cd..3170fe1 100644
--- a/src/MuxElements.cpp
+++ b/src/MuxElements.cpp
@@ -105,7 +105,7 @@ int DabLabel::setShortLabel(const std::string& slabel)
for (size_t i = 0; i < m_label.size(); ++i) {
if (*slab == m_label[i]) {
flag |= 0x8000 >> i;
- if (*(++slab) == 0) {
+ if (*(++slab) == '\0') {
break;
}
}
diff --git a/src/dabOutput/edi/TagPacket.cpp b/src/dabOutput/edi/TagPacket.cpp
index fbb0f8b..aa4f23b 100644
--- a/src/dabOutput/edi/TagPacket.cpp
+++ b/src/dabOutput/edi/TagPacket.cpp
@@ -31,6 +31,7 @@
#include <string>
#include <list>
#include <stdint.h>
+#include <cassert>
std::vector<uint8_t> TagPacket::Assemble()
@@ -41,21 +42,17 @@ std::vector<uint8_t> TagPacket::Assemble()
//std::cerr << "Assemble TAGPacket" << std::endl;
- size_t packet_length = 0;
for (tag = tag_items.begin(); tag != tag_items.end(); ++tag) {
std::vector<uint8_t> tag_data = (*tag)->Assemble();
packet.insert(packet.end(), tag_data.begin(), tag_data.end());
- packet_length += tag_data.size();
-
//std::cerr << " Add TAGItem of length " << tag_data.size() << std::endl;
}
// Add padding
- while (packet_length % 8 > 0)
+ while (packet.size() % 8 > 0)
{
packet.push_back(0); // TS 102 821, 5.1, "padding shall be undefined"
- packet_length++;
}
return packet;