mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-16 07:07:18 +00:00
Code Issues Releases Wiki Activity

Apply fixes by clang-tidy

Browse Source
This commit is contained in:
Carles Fernandez
2019-06-30 00:01:54 +02:00
parent d75abe6758
commit d5e5e5725d
19 changed files with 91 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
View File

@@ -81,7 +81,7 @@ CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configurati
{
for (int n = 0; n < channels_in_udp_; n++)
{
null_sinks_.push_back(gr::blocks::null_sink::make(sizeof(gr_complex)));
null_sinks_.emplace_back(gr::blocks::null_sink::make(sizeof(gr_complex)));
}
}
else
@@ -95,7 +95,7 @@ CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configurati
for (int n = 0; n < channels_in_udp_; n++)
{
DLOG(INFO) << "Dumping output into file " << (dump_filename_ + "c_h" + std::to_string(n) + ".bin");
file_sink_.push_back(gr::blocks::file_sink::make(item_size_, (dump_filename_ + "_ch" + std::to_string(n) + ".bin").c_str()));
file_sink_.emplace_back(gr::blocks::file_sink::make(item_size_, (dump_filename_ + "_ch" + std::to_string(n) + ".bin").c_str()));
}
}
if (in_stream_ > 0)

15
src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
View File

@@ -290,7 +290,10 @@ void Gr_Complex_Ip_Packet_Source::pcap_callback(__attribute__((unused)) u_char *
// write all in a single memcpy
memcpy(&fifo_buff[fifo_write_ptr], &udp_payload[0], payload_length_bytes); // size in bytes
fifo_write_ptr += payload_length_bytes;
if (fifo_write_ptr == FIFO_SIZE) fifo_write_ptr = 0;
if (fifo_write_ptr == FIFO_SIZE)
{
fifo_write_ptr = 0;
}
fifo_items += payload_length_bytes;
}
else
@@ -378,7 +381,10 @@ void Gr_Complex_Ip_Packet_Source::demux_samples(gr_vector_void_star output_items
std::cout << "Unknown wire sample type\n";
exit(0);
}
if (fifo_read_ptr == FIFO_SIZE) fifo_read_ptr = 0;
if (fifo_read_ptr == FIFO_SIZE)
{
fifo_read_ptr = 0;
}
}
}
@@ -389,7 +395,10 @@ int Gr_Complex_Ip_Packet_Source::work(int noutput_items,
{
// send samples to next GNU Radio block
boost::mutex::scoped_lock lock(d_mutex); // hold mutex for duration of this function
if (fifo_items == 0) return 0;
if (fifo_items == 0)
{
return 0;
}
if (output_items.size() > static_cast<uint64_t>(d_n_baseband_channels))
{