Skip to content

Commit 0602525

Browse files
peternewmanpeternewman
committed
Fix a bunch of cpplint issues
1 parent c94f654 commit 0602525

20 files changed

Lines changed: 85 additions & 60 deletions

‎common/rdm/RDMHelper.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,8 @@ string UnitToString(uint8_t unit) {
12391239

12401240

12411241
/**
1242-
* Convert a uint8_t representing a shipping lock state to a human-readable string.
1242+
* Convert a uint8_t representing a shipping lock state to a human-readable
1243+
* string.
12431244
* @param shipping_lock_state the shipping lock state value
12441245
*/
12451246
string ShippingLockStateToString(uint8_t shipping_lock_state) {

‎common/rdm/ResponderHelper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ bool ResponderHelper::ExtractString(const RDMRequest *request,
8787
return false;
8888
}
8989

90-
size_t len = (size_t) request->ParamDataSize();
90+
size_t len = static_cast<size_t>(request->ParamDataSize());
9191
if (request->ParamData() != NULL) {
9292
// StrNLength ensures we stop on the first null we hit
9393
len = StrNLength(reinterpret_cast<const char*>(request->ParamData()),
94-
min(len, (size_t) max_length));
94+
min(len, static_cast<size_t>(max_length)));
9595
}
9696
const string value(reinterpret_cast<const char*>(request->ParamData()), len);
9797
*output = value;

‎common/utils/StringUtilsTest.cpp‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,12 @@ void StringUtilsTest::testIntToHexString() {
348348

349349
OLA_ASSERT_EQ(string("0x01"), IntToHexString((uint8_t)1));
350350
OLA_ASSERT_EQ(string("0x42"), IntToHexString((uint8_t)0x42));
351-
OLA_ASSERT_EQ(string("0x0001"), IntToHexString((uint16_t)0x0001));
352-
OLA_ASSERT_EQ(string("0xabcd"), IntToHexString((uint16_t)0xABCD));
353-
OLA_ASSERT_EQ(string("0xdeadbeef"), IntToHexString((uint32_t)0xDEADBEEF));
351+
OLA_ASSERT_EQ(string("0x0001"),
352+
IntToHexString(static_cast<uint16_t>(0x0001)));
353+
OLA_ASSERT_EQ(string("0xabcd"),
354+
IntToHexString(static_cast<uint16_t>(0xABCD)));
355+
OLA_ASSERT_EQ(string("0xdeadbeef"),
356+
IntToHexString(static_cast<uint32_t>(0xDEADBEEF)));
354357
// Deliberately no IntToHexString(uint64_t) or test as its deprecated
355358

356359
unsigned int i = 0x42;
@@ -370,19 +373,19 @@ void StringUtilsTest::testIntToHexString() {
370373
OLA_ASSERT_EQ(string("0x42"), str.str());
371374
str.str("");
372375

373-
str << ToHex((uint16_t)0x0001);
376+
str << ToHex(static_cast<uint16_t>(0x0001));
374377
OLA_ASSERT_EQ(string("0x0001"), str.str());
375378
str.str("");
376379

377-
str << ToHex((uint16_t)0xABCD);
380+
str << ToHex(static_cast<uint16_t>(0xABCD));
378381
OLA_ASSERT_EQ(string("0xabcd"), str.str());
379382
str.str("");
380383

381-
str << ToHex((uint32_t)0xDEADBEEF);
384+
str << ToHex(static_cast<uint32_t>(0xDEADBEEF));
382385
OLA_ASSERT_EQ(string("0xdeadbeef"), str.str());
383386
str.str("");
384387

385-
str << ToHex((uint64_t)0xDEADBEEFFEEDFACE);
388+
str << ToHex(static_cast<uint64_t>(0xDEADBEEFFEEDFACE));
386389
OLA_ASSERT_EQ(string("0xdeadbeeffeedface"), str.str());
387390
str.str("");
388391

@@ -395,7 +398,7 @@ void StringUtilsTest::testIntToHexString() {
395398
OLA_ASSERT_EQ(string("42"), str.str());
396399
str.str("");
397400

398-
str << ToHex((uint16_t)0xABCD, false);
401+
str << ToHex(static_cast<uint16_t>(0xABCD), false);
399402
OLA_ASSERT_EQ(string("abcd"), str.str());
400403
str.str("");
401404
}
@@ -578,8 +581,9 @@ void StringUtilsTest::testStringToUIntOrDefault() {
578581
OLA_ASSERT_EQ(1u, StringToIntOrDefault("1", 42u));
579582
OLA_ASSERT_EQ(65537u, StringToIntOrDefault("65537", 42u));
580583
OLA_ASSERT_EQ(4294967295U, StringToIntOrDefault("4294967295", 42U));
581-
OLA_ASSERT_EQ((uint64_t) 77000000000,
582-
StringToIntOrDefault("77000000000", (uint64_t) 42));
584+
OLA_ASSERT_EQ(
585+
static_cast<uint64_t>(77000000000),
586+
StringToIntOrDefault("77000000000", static_cast<uint64_t>(42)));
583587
OLA_ASSERT_EQ(42u, StringToIntOrDefault("4294967296", 42u));
584588
OLA_ASSERT_EQ(42u, StringToIntOrDefault("foo", 42u));
585589

‎doxygen/examples/receiver.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <ola/DmxBuffer.h>
2020
#include <ola/Logging.h>
2121
#include <ola/client/ClientWrapper.h>
22+
#include <iostream>
2223
#include <string>
2324

2425
static const unsigned int UNIVERSE = 1;

‎include/ola/rdm/RDMHelper.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ std::string StatusMessageIdToString(uint16_t message_id,
6666
std::string StatusTypeToString(uint8_t status_type);
6767
std::string UnitToString(uint8_t unit);
6868
std::string ShippingLockStateToString(uint8_t shipping_lock_state);
69-
bool UIntToShippingLockState(uint8_t state, rdm_shipping_lock_state *shipping_lock_state);
69+
bool UIntToShippingLockState(uint8_t state,
70+
rdm_shipping_lock_state *shipping_lock_state);
7071
} // namespace rdm
7172
} // namespace ola
7273
#endif // INCLUDE_OLA_RDM_RDMHELPER_H_

‎include/ola/rdm/ResponderNSCStatus.h‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,25 @@ class NSCStatus {
147147
// Size() + 1 to account for the start code
148148

149149
m_additive_checksum = buffer.AdditiveChecksum();
150-
m_most_recent_slot_count = std::min(NSC_STATUS_MOST_RECENT_SLOT_COUNT_MAX,
151-
(uint16_t) (buffer.Size() + 1));
150+
m_most_recent_slot_count = std::min(
151+
NSC_STATUS_MOST_RECENT_SLOT_COUNT_MAX,
152+
static_cast<uint16_t>(buffer.Size() + 1));
152153

153154
if (m_packet_count == 0) {
154155
// We must set the buffer size explicitly here on the first packet or
155156
// we'd be permanently stuck at 0
156157
m_min_slot_count = std::min(NSC_STATUS_MIN_SLOT_COUNT_MAX,
157-
(uint16_t) (buffer.Size() + 1));
158+
static_cast<uint16_t>(buffer.Size() + 1));
158159
} else {
159-
m_min_slot_count = std::min(NSC_STATUS_MIN_SLOT_COUNT_MAX,
160-
std::min(m_min_slot_count,
161-
(uint16_t) (buffer.Size() + 1)));
160+
m_min_slot_count = std::min(
161+
NSC_STATUS_MIN_SLOT_COUNT_MAX,
162+
std::min(m_min_slot_count,
163+
static_cast<uint16_t>(buffer.Size() + 1)));
162164
}
163165

164-
m_max_slot_count = std::min(NSC_STATUS_MAX_SLOT_COUNT_MAX,
165-
std::max(m_max_slot_count,
166-
(uint16_t) (buffer.Size() + 1)));
166+
m_max_slot_count = std::min(
167+
NSC_STATUS_MAX_SLOT_COUNT_MAX,
168+
std::max(m_max_slot_count, static_cast<uint16_t>(buffer.Size() + 1)));
167169

168170
// Update packet counter last so we can use it to track whether this is the
169171
// first packet or not

‎libs/acn/DMPAddress.cpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ unsigned int DMPSizeToByteSize(dmp_address_size size) {
4646
* Create a new single address
4747
*/
4848
const BaseDMPAddress *NewSingleAddress(unsigned int value) {
49-
if (value > MAX_TWO_BYTE)
49+
if (value > MAX_TWO_BYTE) {
5050
return new FourByteDMPAddress(value);
51-
else if (value > MAX_ONE_BYTE)
52-
return new TwoByteDMPAddress((uint16_t) value);
51+
} else if (value > MAX_ONE_BYTE) {
52+
return new TwoByteDMPAddress(static_cast<uint16_t>(value));
53+
}
5354
return new OneByteDMPAddress((uint8_t) value);
5455
}
5556

@@ -61,13 +62,14 @@ const BaseDMPAddress *NewRangeAddress(unsigned int value,
6162
unsigned int increment,
6263
unsigned int number) {
6364
if (value > MAX_TWO_BYTE || increment > MAX_TWO_BYTE ||
64-
number > MAX_TWO_BYTE)
65+
number > MAX_TWO_BYTE) {
6566
return new FourByteRangeDMPAddress(value, increment, number);
66-
else if (value > MAX_ONE_BYTE || increment > MAX_ONE_BYTE ||
67-
number > MAX_ONE_BYTE)
68-
return new TwoByteRangeDMPAddress((uint16_t) value,
69-
(uint16_t) increment,
70-
(uint16_t) number);
67+
} else if (value > MAX_ONE_BYTE || increment > MAX_ONE_BYTE ||
68+
number > MAX_ONE_BYTE) {
69+
return new TwoByteRangeDMPAddress(static_cast<uint16_t>(value),
70+
static_cast<uint16_t>(increment),
71+
static_cast<uint16_t>(number));
72+
}
7173
return new OneByteRangeDMPAddress((uint8_t) value,
7274
(uint8_t) increment,
7375
(uint8_t) number);

‎libs/acn/E131Node.cpp‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ void TrackedSource::NewPage(uint8_t page_number, uint8_t last_page,
9393
uint8_t expected_page = 0;
9494
set<uint8_t>::const_iterator iter = received_pages.begin();
9595
for (; iter != received_pages.end(); ++iter) {
96-
if (*iter != expected_page)
96+
if (*iter != expected_page) {
9797
return;
98+
}
9899

99100
expected_page++;
100101
}
@@ -152,8 +153,9 @@ E131Node::~E131Node() {
152153
}
153154

154155
Stop();
155-
if (m_send_buffer)
156+
if (m_send_buffer) {
156157
delete[] m_send_buffer;
158+
}
157159

158160
STLDeleteValues(&m_discovered_sources);
159161
}
@@ -276,7 +278,8 @@ bool E131Node::SendDMXWithSequenceOffset(uint16_t universe,
276278
dmp_data_length = data_size + 1;
277279
}
278280

279-
TwoByteRangeDMPAddress range_addr(0, 1, (uint16_t) dmp_data_length);
281+
TwoByteRangeDMPAddress range_addr(0, 1,
282+
static_cast<uint16_t>(dmp_data_length));
280283
DMPAddressData<TwoByteRangeDMPAddress> range_chunk(&range_addr,
281284
dmp_data,
282285
dmp_data_length);
@@ -295,8 +298,9 @@ bool E131Node::SendDMXWithSequenceOffset(uint16_t universe,
295298
m_options.use_rev2);
296299

297300
bool result = m_e131_sender.SendDMP(header, pdu);
298-
if (result && !sequence_offset)
301+
if (result && !sequence_offset) {
299302
settings->sequence++;
303+
}
300304
delete pdu;
301305
return result;
302306
}
@@ -321,7 +325,7 @@ bool E131Node::SendStreamTerminated(uint16_t universe,
321325
buffer.Get(m_send_buffer + 1, &data_size);
322326
data_size++;
323327

324-
TwoByteRangeDMPAddress range_addr(0, 1, (uint16_t) data_size);
328+
TwoByteRangeDMPAddress range_addr(0, 1, static_cast<uint16_t>(data_size));
325329
DMPAddressData<TwoByteRangeDMPAddress> range_chunk(
326330
&range_addr, m_send_buffer, data_size);
327331
vector<DMPAddressData<TwoByteRangeDMPAddress> > ranged_chunks;
@@ -339,8 +343,9 @@ bool E131Node::SendStreamTerminated(uint16_t universe,
339343

340344
bool result = m_e131_sender.SendDMP(header, pdu);
341345
// only update if we were previously tracking this universe
342-
if (result && iter != m_tx_universes.end())
346+
if (result && iter != m_tx_universes.end()) {
343347
iter->second.sequence++;
348+
}
344349
delete pdu;
345350
return result;
346351
}

‎libs/acn/E131PDUTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void E131PDUTest::testSimpleRev2E131PDU() {
8686
OLA_ASSERT_EQ((uint8_t) 2,
8787
data[7 + E131Rev2Header::REV2_SOURCE_NAME_LEN]);
8888
OLA_ASSERT_EQ(
89-
HostToNetwork((uint16_t) 6000),
89+
HostToNetwork(static_cast<uint16_t>(6000)),
9090
*(reinterpret_cast<uint16_t*>(
9191
data + 8 + E131Rev2Header::REV2_SOURCE_NAME_LEN)));
9292

@@ -136,7 +136,7 @@ void E131PDUTest::testSimpleE131PDU() {
136136
uint16_t actual_universe;
137137
memcpy(&actual_universe, data + 11 + E131Header::SOURCE_NAME_LEN,
138138
sizeof(actual_universe));
139-
OLA_ASSERT_EQ(HostToNetwork((uint16_t) 6000), actual_universe);
139+
OLA_ASSERT_EQ(HostToNetwork(static_cast<uint16_t>(6000)), actual_universe);
140140

141141
// test undersized buffer
142142
bytes_used = size - 1;

‎libs/acn/E131TestFramework.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <assert.h>
2424
#include <stdio.h>
2525
#include <unistd.h>
26+
#include <iostream>
2627
#include <string>
2728
#include <vector>
2829
#include "ola/acn/CID.h"

0 commit comments

Comments
 (0)