Skip to content

Commit b8c5606

Browse files
committed
Uncrustify
Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
1 parent aaebff8 commit b8c5606

13 files changed

Lines changed: 130 additions & 125 deletions

include/fastdds/rtps/messages/CDRMessage.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ inline bool CDRMessage::add_string(
648648
bool valid = CDRMessage::addUInt32(msg, str_siz);
649649
valid &= CDRMessage::addData(msg, (unsigned char*) in_str, str_siz);
650650
octet oc = '\0';
651-
for (; str_siz& 3; ++str_siz)
651+
for (; str_siz & 3; ++str_siz)
652652
{
653653
valid &= CDRMessage::addOctet(msg, oc);
654654
}

src/cpp/fastdds/domain/DomainParticipantFactory.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ DomainParticipant* DomainParticipantFactory::create_participant(
170170
DomainParticipant* dom_part = new DomainParticipant(mask);
171171
DomainParticipantImpl* dom_part_impl = new DomainParticipantImpl(dom_part, did, pqos, listen);
172172
#else
173-
eprosima::fastdds::statistics::dds::DomainParticipant* dom_part = new eprosima::fastdds::statistics::dds::DomainParticipant(mask);
173+
eprosima::fastdds::statistics::dds::DomainParticipant* dom_part =
174+
new eprosima::fastdds::statistics::dds::DomainParticipant(mask);
174175
eprosima::fastdds::statistics::dds::DomainParticipantImpl* dom_part_impl =
175176
new eprosima::fastdds::statistics::dds::DomainParticipantImpl(dom_part, did, pqos, listen);
176177
#endif // FASTDDS_STATISTICS

test/blackbox/common/BlackboxTestsDiscovery.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ TEST_P(Discovery, PubSubAsReliableHelloworldEndpointUserData)
10071007
}
10081008

10091009
//! Auxiliar method for discovering participants tests
1010-
template <typename ParticipantConfigurator>
1010+
template<typename ParticipantConfigurator>
10111011
static void discoverParticipantsTest(
10121012
bool avoid_multicast,
10131013
size_t n_participants,

test/blackbox/common/DDSBlackboxTestsDataReader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,8 @@ TEST(DDSDataReader, GetFirstUntakenInfoReturnsTheFirstValidChange)
329329
eprosima::fastdds::dds::SampleInfo info;
330330
for (size_t i = 0; i < 3; i++)
331331
{
332-
ASSERT_NE(eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK, reader.get_native_reader().get_first_untaken_info(
332+
ASSERT_NE(eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK,
333+
reader.get_native_reader().get_first_untaken_info(
333334
&info));
334335
std::this_thread::sleep_for(std::chrono::milliseconds(500));
335336
}

test/blackbox/common/DDSBlackboxTestsDataWriter.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,8 @@ class TestsDataWriterQosCommonUtils
468468
qos.resource_limits().max_samples = 1000;
469469
qos.transport_priority().value = 1;
470470
qos.ownership().kind = eprosima::fastdds::dds::EXCLUSIVE_OWNERSHIP_QOS;
471-
qos.representation().m_value.push_back(eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION);
471+
qos.representation().m_value.push_back(
472+
eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION);
472473
qos.history().kind = eprosima::fastdds::dds::KEEP_ALL_HISTORY_QOS;
473474
qos.lifespan().duration = {5, 0};
474475
}

test/blackbox/common/DDSBlackboxTestsMonitorService.cpp

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ class MonitorServiceParticipant
201201

202202
writer_stat_guids_.push_back(statistics::to_statistics_type(writers_.back()->guid()));
203203

204-
std::cout << "Created datawriter " << writers_.back()->guid() << " for topic " <<
205-
topics_.back()->get_name() << std::endl;
204+
std::cout << "Created datawriter " << writers_.back()->guid() << " for topic "
205+
<< topics_.back()->get_name() << std::endl;
206206
}
207207

208208
void create_and_add_reader(
@@ -224,8 +224,8 @@ class MonitorServiceParticipant
224224

225225
reader_stat_guids_.push_back(statistics::to_statistics_type(readers_.back()->guid()));
226226

227-
std::cout << "Created datareader " << readers_.back()->guid() << " for topic " <<
228-
topics_.back()->get_name() << std::endl;
227+
std::cout << "Created datareader " << readers_.back()->guid() << " for topic "
228+
<< topics_.back()->get_name() << std::endl;
229229
}
230230

231231
bool delete_writer()
@@ -348,8 +348,8 @@ class MonitorServiceParticipant
348348
++cb_counters_[OFFERED_DEADLINE_MISSED_IDX];
349349
}
350350

351-
std::cout << "on_offered_deadline_missed() " << writer->guid() << " total_count " << status.total_count <<
352-
std::endl;
351+
std::cout << "on_offered_deadline_missed() " << writer->guid() << " total_count " << status.total_count
352+
<< std::endl;
353353
}
354354

355355
void on_offered_incompatible_qos (
@@ -361,8 +361,8 @@ class MonitorServiceParticipant
361361
++cb_counters_[OFFERED_INCOMPATIBLE_QOS_IDX];
362362
}
363363

364-
std::cout << "on_offered_incompatible_qos " << writer->guid() << " total_count " << status.total_count <<
365-
std::endl;
364+
std::cout << "on_offered_incompatible_qos " << writer->guid() << " total_count " << status.total_count
365+
<< std::endl;
366366
}
367367

368368
void on_liveliness_lost (
@@ -386,8 +386,8 @@ class MonitorServiceParticipant
386386
++cb_counters_[PUBLICATION_MATCHED_IDX];
387387
}
388388

389-
std::cout << "on_publication_matched " << writer->guid() << " total_count " << status.total_count <<
390-
std::endl;
389+
std::cout << "on_publication_matched " << writer->guid() << " total_count " << status.total_count
390+
<< std::endl;
391391
}
392392

393393
void on_requested_deadline_missed (
@@ -399,8 +399,8 @@ class MonitorServiceParticipant
399399
++cb_counters_[REQUESTED_DEADLINE_MISSED_IDX];
400400
}
401401

402-
std::cout << "on_requested_deadline_missed" << reader->guid() << " total_count " << status.total_count <<
403-
std::endl;
402+
std::cout << "on_requested_deadline_missed" << reader->guid() << " total_count " << status.total_count
403+
<< std::endl;
404404
}
405405

406406
void on_requested_incompatible_qos (
@@ -412,8 +412,8 @@ class MonitorServiceParticipant
412412
++cb_counters_[REQUESTED_INCOMPATIBLE_QOS_IDX];
413413
}
414414

415-
std::cout << "on_requested_incompatible_qos" << reader->guid() << " total_count " << status.total_count <<
416-
std::endl;
415+
std::cout << "on_requested_incompatible_qos" << reader->guid() << " total_count " << status.total_count
416+
<< std::endl;
417417
}
418418

419419
void on_liveliness_changed (
@@ -425,8 +425,8 @@ class MonitorServiceParticipant
425425
++cb_counters_[LIVELINESS_CHANGED_IDX];
426426
}
427427

428-
std::cout << "on_liveliness_changed " << reader->guid() << " not_alive_count " << status.not_alive_count <<
429-
std::endl;
428+
std::cout << "on_liveliness_changed " << reader->guid() << " not_alive_count " << status.not_alive_count
429+
<< std::endl;
430430
}
431431

432432
void on_subscription_matched (
@@ -438,8 +438,8 @@ class MonitorServiceParticipant
438438
++cb_counters_[SUBSCRIPTION_MATCHED_IDX];
439439
}
440440

441-
std::cout << "on_subscription_matched " << reader->guid() << " total_count " << status.total_count <<
442-
std::endl;
441+
std::cout << "on_subscription_matched " << reader->guid() << " total_count " << status.total_count
442+
<< std::endl;
443443
}
444444

445445
void on_sample_lost (
@@ -687,13 +687,13 @@ struct ProxySampleValidator : public SampleValidator
687687
[&](const MonitorServiceType::type& elem)
688688
{
689689
return (data.status_kind() == elem.status_kind()) &&
690-
data.local_entity() == elem.local_entity();
690+
data.local_entity() == elem.local_entity();
691691
});
692692

693693
if (it == total_msgs.end())
694694
{
695-
std::cout << "Unexpected proxy " << statistics::to_fastdds_type(data.local_entity()) <<
696-
data.status_kind() << std::endl;
695+
std::cout << "Unexpected proxy " << statistics::to_fastdds_type(data.local_entity())
696+
<< data.status_kind() << std::endl;
697697
return;
698698
}
699699

@@ -756,7 +756,7 @@ struct ProxySampleValidator : public SampleValidator
756756
[&](const MonitorServiceType::type& elem)
757757
{
758758
return (data.status_kind() == elem.status_kind()) &&
759-
data.local_entity() == elem.local_entity();
759+
data.local_entity() == elem.local_entity();
760760
});
761761

762762
std::cout << "Received unregistration of instance "
@@ -792,8 +792,8 @@ struct ConnectionListSampleValidator : public SampleValidator
792792

793793
for (auto& connection : data.value().connection_list())
794794
{
795-
std::cout << "Received Connection: \n\tMode: " << connection.mode() <<
796-
"\n\tGuid " << statistics::to_fastdds_type(connection.guid()) << "\n\t"
795+
std::cout << "Received Connection: \n\tMode: " << connection.mode()
796+
<< "\n\tGuid " << statistics::to_fastdds_type(connection.guid()) << "\n\t"
797797
<< "Announced Locators: ";
798798
for (auto& locator : connection.used_locators())
799799
{
@@ -844,9 +844,10 @@ struct ConnectionListSampleValidator : public SampleValidator
844844
EPROSIMA_LOG_ERROR(BBTestsMonitorService,
845845
"Locator not found in sample msg "
846846
<< statistics::to_fastdds_type(total_msgs_elem_connection.
847-
announced_locators()[i]) <<
848-
" for local entity " <<
849-
statistics::to_fastdds_type(total_msgs_elem.local_entity()));
847+
announced_locators()[i])
848+
<< " for local entity "
849+
<< statistics::to_fastdds_type(
850+
total_msgs_elem.local_entity()));
850851
same_locators = false;
851852
break;
852853
}
@@ -903,9 +904,9 @@ struct IncompatibleQoSSampleValidator : public SampleValidator
903904
[&](const MonitorServiceType::type& elem)
904905
{
905906
return (data.status_kind() == elem.status_kind()) &&
906-
(data.local_entity() == elem.local_entity()) &&
907-
(data.value().incompatible_qos_status().last_policy_id()
908-
== elem.value().incompatible_qos_status().last_policy_id());
907+
(data.local_entity() == elem.local_entity()) &&
908+
(data.value().incompatible_qos_status().last_policy_id()
909+
== elem.value().incompatible_qos_status().last_policy_id());
909910
});
910911

911912
if (assert_on_non_expected_msgs_)
@@ -942,9 +943,9 @@ struct LivelinessLostSampleValidator : public SampleValidator
942943
[&](const MonitorServiceType::type& elem)
943944
{
944945
return (data.status_kind() == elem.status_kind()) &&
945-
(data.local_entity() == elem.local_entity()) &&
946-
(data.value().liveliness_lost_status().total_count()
947-
== elem.value().liveliness_lost_status().total_count());
946+
(data.local_entity() == elem.local_entity()) &&
947+
(data.value().liveliness_lost_status().total_count()
948+
== elem.value().liveliness_lost_status().total_count());
948949
});
949950

950951
if (assert_on_non_expected_msgs_)
@@ -981,9 +982,9 @@ struct LivelinessChangedSampleValidator : public SampleValidator
981982
[&](const MonitorServiceType::type& elem)
982983
{
983984
return (data.status_kind() == elem.status_kind()) &&
984-
(data.local_entity() == elem.local_entity()) &&
985-
(data.value().liveliness_changed_status().not_alive_count()
986-
>= elem.value().liveliness_changed_status().not_alive_count());
985+
(data.local_entity() == elem.local_entity()) &&
986+
(data.value().liveliness_changed_status().not_alive_count()
987+
>= elem.value().liveliness_changed_status().not_alive_count());
987988
});
988989

989990
std::cout << "Received Liveliness Changed on local_entity "
@@ -1025,9 +1026,9 @@ struct DeadlineMissedSampleValidator : public SampleValidator
10251026
[&](const MonitorServiceType::type& elem)
10261027
{
10271028
return (data.status_kind() == elem.status_kind()) &&
1028-
(data.local_entity() == elem.local_entity()) &&
1029-
(data.value().deadline_missed_status().total_count()
1030-
>= elem.value().deadline_missed_status().total_count());
1029+
(data.local_entity() == elem.local_entity()) &&
1030+
(data.value().deadline_missed_status().total_count()
1031+
>= elem.value().deadline_missed_status().total_count());
10311032
});
10321033

10331034
std::cout << "Received Deadline Missed on local_entity "
@@ -1064,8 +1065,8 @@ struct SampleLostSampleValidator : public SampleValidator
10641065
[&](const MonitorServiceType::type& elem)
10651066
{
10661067
return (data.status_kind() == elem.status_kind()) &&
1067-
(data.local_entity() == elem.local_entity()) &&
1068-
(data.value().sample_lost_status().total_count() >= 1);
1068+
(data.local_entity() == elem.local_entity()) &&
1069+
(data.value().sample_lost_status().total_count() >= 1);
10691070
});
10701071

10711072
std::cout << "Received Sample Lost on local_entity "

test/blackbox/common/DDSBlackboxTestsPersistence.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ class PersistenceLargeData : public testing::TestWithParam<communication_type>
7474
std::ostringstream ss;
7575
std::string test_case_name(info->test_case_name());
7676
std::string test_name(info->name());
77-
ss <<
78-
test_case_name.replace(test_case_name.find_first_of('/'), 1, "_") << "_" <<
79-
test_name.replace(test_name.find_first_of('/'), 1, "_") << "_" << GET_PID() << ".db";
77+
ss
78+
<< test_case_name.replace(test_case_name.find_first_of('/'), 1, "_") << "_"
79+
<< test_name.replace(test_name.find_first_of('/'), 1, "_") << "_" << GET_PID() << ".db";
8080
db_file_name_ = ss.str();
8181

8282
}

0 commit comments

Comments
 (0)