mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-13 21:57:14 +00:00
Code Issues Releases Wiki Activity

Reduce number of warnings raised by bugprone-* clang-tidy checks

Browse Source
This commit is contained in:
Carles Fernandez
2020-07-10 00:37:55 +02:00
parent a597478b24
commit c04948fd02
135 changed files with 981 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,16 +406,6 @@ int Gr_Complex_Ip_Packet_Source::work(int noutput_items,
switch (d_wire_sample_type)
{
case 1: // complex byte samples
bytes_requested = noutput_items * d_bytes_per_sample;
if (bytes_requested < fifo_items)
{
num_samples_readed = noutput_items; // read all
}
else
{
num_samples_readed = fifo_items / d_bytes_per_sample; // read what we have
}
break;
case 2: // complex 4 bits samples
bytes_requested = noutput_items * d_bytes_per_sample;
if (bytes_requested < fifo_items)

4
src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
View File

@@ -418,7 +418,7 @@ int labsat23_source::general_work(int noutput_items,
{
std::vector<int16_t> memblock(n_int16_to_read);
binary_input_file.read(reinterpret_cast<char *>(memblock.data()), n_int16_to_read * 2);
n_int16_to_read = binary_input_file.gcount() / 2; // from bytes to int16
n_int16_to_read = static_cast<int>(binary_input_file.gcount()) / 2; // from bytes to int16
if (n_int16_to_read > 0)
{
int output_pointer = 0;
@@ -476,7 +476,7 @@ int labsat23_source::general_work(int noutput_items,
{
std::vector<int16_t> memblock(n_int16_to_read);
binary_input_file.read(reinterpret_cast<char *>(memblock.data()), n_int16_to_read * 2);
n_int16_to_read = binary_input_file.gcount() / 2; // from bytes to int16
n_int16_to_read = static_cast<int>(binary_input_file.gcount()) / 2; // from bytes to int16
if (n_int16_to_read > 0)
{
int output_pointer = 0;

6
src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
View File

@@ -235,12 +235,12 @@ void rtl_tcp_signal_source_c::set_if_gain(int gain)
{3, 15, 3}};
std::map<int, double> gains;
for (int i = 0; i < static_cast<int>(ranges.size()); i++)
for (size_t i = 0; i < ranges.size(); i++)
{
gains[i + 1] = ranges[i].start;
}
for (int i = ranges.size() - 1; i >= 0; i--)
for (size_t i = ranges.size() - 1; i > 0; i--)
{
const range &r = ranges[i];
double error = gain;
@@ -248,7 +248,7 @@ void rtl_tcp_signal_source_c::set_if_gain(int gain)
while (g < r.stop)
{
double sum = 0;
for (int j = 0; j < static_cast<int>(gains.size()); j++)
for (size_t j = 0; j < gains.size(); j++)
{
if (i == j)
{

24
src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc
View File

@@ -23,15 +23,15 @@
#include <gnuradio/io_signature.h>
#include <cmath>
unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(unsigned int adc_nbit_)
unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(int adc_nbit_)
{
return unpack_spir_gss6450_samples_sptr(new unpack_spir_gss6450_samples(adc_nbit_));
}
unpack_spir_gss6450_samples::unpack_spir_gss6450_samples(unsigned int adc_nbit) : gr::sync_interpolator("unpack_spir_gss6450_samples",
gr::io_signature::make(1, 1, sizeof(int32_t)),
gr::io_signature::make(1, 1, sizeof(gr_complex)), 16 / adc_nbit)
unpack_spir_gss6450_samples::unpack_spir_gss6450_samples(int adc_nbit) : gr::sync_interpolator("unpack_spir_gss6450_samples",
gr::io_signature::make(1, 1, sizeof(int32_t)),
gr::io_signature::make(1, 1, sizeof(gr_complex)), 16 / adc_nbit)
{
adc_bits = adc_nbit;
samples_per_int = 16 / adc_bits;
@@ -53,21 +53,21 @@ void unpack_spir_gss6450_samples::decode_4bits_word(uint32_t input_uint32, gr_co
if (tmp_char >= 2)
{
I = (tmp_char - 4);
I = static_cast<float>(tmp_char - 4);
}
else
{
I = tmp_char;
I = static_cast<float>(tmp_char);
}
input_uint32 = input_uint32 >> 2;
tmp_char = input_uint32 & 3;
if (tmp_char >= 2)
{
Q = (tmp_char - 4);
Q = static_cast<float>(tmp_char - 4);
}
else
{
Q = tmp_char;
Q = static_cast<float>(tmp_char);
}
input_uint32 = input_uint32 >> 2;
@@ -82,21 +82,21 @@ void unpack_spir_gss6450_samples::decode_4bits_word(uint32_t input_uint32, gr_co
if (tmp_char >= 8)
{
I = (tmp_char - 16);
I = static_cast<float>(tmp_char - 16);
}
else
{
I = tmp_char;
I = static_cast<float>(tmp_char);
}
input_uint32 = input_uint32 >> 4;
tmp_char = input_uint32 & 0x0F;
if (tmp_char >= 8)
{
Q = (tmp_char - 16);
Q = static_cast<float>(tmp_char - 16);
}
else
{
Q = tmp_char;
Q = static_cast<float>(tmp_char);
}
input_uint32 = input_uint32 >> 4;

10
src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
View File

@@ -36,22 +36,22 @@ using unpack_spir_gss6450_samples_sptr = std::shared_ptr<unpack_spir_gss6450_sam
using unpack_spir_gss6450_samples_sptr = boost::shared_ptr<unpack_spir_gss6450_samples>;
#endif
unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(unsigned int adc_nbit_);
unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(int adc_nbit_);
class unpack_spir_gss6450_samples : public gr::sync_interpolator
{
public:
explicit unpack_spir_gss6450_samples(unsigned int adc_nbit);
explicit unpack_spir_gss6450_samples(int adc_nbit);
~unpack_spir_gss6450_samples() = default;
void decode_4bits_word(uint32_t input_uint32, gr_complex *out, int adc_bits_);
int work(int noutput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
private:
friend unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples_sptr(unsigned int adc_nbit);
unsigned int adc_bits;
unsigned int samples_per_int;
friend unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples_sptr(int adc_nbit);
int adc_bits;
int samples_per_int;
};
#endif // GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H