From 070996cdb4ef1962f530714ba8dccffd26435b68 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 4 Aug 2019 13:15:03 +0200 Subject: [PATCH] Apply clang-tidy check readability-else-after-return --- src/algorithms/PVT/libs/rinex_printer.cc | 7 +-- .../adapters/beidou_b1i_pcps_acquisition.cc | 2 +- .../adapters/beidou_b3i_pcps_acquisition.cc | 2 +- .../adapters/freq_xlating_fir_filter.cc | 16 +++---- src/algorithms/libs/rtklib/rtklib_rtkcmn.cc | 2 +- .../gnuradio_blocks/hybrid_observables_gs.cc | 4 -- .../gr_complex_ip_packet_source.cc | 5 +-- .../gnuradio_blocks/labsat23_source.cc | 43 ++++++++----------- .../gps_l1_ca_telemetry_decoder_gs.cc | 9 +--- .../tracking/libs/tracking_discriminators.cc | 2 +- src/core/libs/supl/supl.c | 5 +-- 11 files changed, 33 insertions(+), 64 deletions(-) diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc index 29b4d1ed7..d4ec72a98 100644 --- a/src/algorithms/PVT/libs/rinex_printer.cc +++ b/src/algorithms/PVT/libs/rinex_printer.cc @@ -11779,11 +11779,8 @@ boost::posix_time::ptime Rinex_Printer::compute_UTC_time(const Gps_Navigation_Me boost::posix_time::ptime p_time(boost::gregorian::date(2019, 4, 7), t); return p_time; } - else - { - boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t); - return p_time; - } + boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t); + return p_time; } diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc index db05d351d..19f7dd89b 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc @@ -300,7 +300,7 @@ gr::basic_block_sptr BeidouB1iPcpsAcquisition::get_left_block() { return acquisition_; } - else if (item_type_ == "cbyte") + if (item_type_ == "cbyte") { return cbyte_to_float_x2_; } diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc index 2cb39be51..105180040 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc @@ -301,7 +301,7 @@ gr::basic_block_sptr BeidouB3iPcpsAcquisition::get_left_block() { return acquisition_; } - else if (item_type_ == "cbyte") + if (item_type_ == "cbyte") { return cbyte_to_float_x2_; } diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc index e800ef2b6..0e86c1949 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -339,11 +339,9 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_left_block() { return gr_char_to_short_; } - else - { - return nullptr; - LOG(ERROR) << " Unknown input filter input/output item type conversion"; - } + + LOG(WARNING) << " Unknown input filter input/output item type conversion"; + return nullptr; } @@ -373,9 +371,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_right_block() { return complex_to_complex_byte_; } - else - { - return nullptr; - LOG(ERROR) << " Unknown input filter input/output item type conversion"; - } + + LOG(WARNING) << " Unknown input filter input/output item type conversion"; + return nullptr; } diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc index 46e78c509..d3b211c27 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc @@ -4241,7 +4241,7 @@ double satwavelen(int sat, int frq, const nav_t *nav) { return SPEED_OF_LIGHT / FREQ8; /* E5a+b */ } - else if (frq == 6) + if (frq == 6) { return SPEED_OF_LIGHT / FREQ9; /* S */ } diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index b3b4ab638..17240a342 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -664,10 +664,6 @@ int hybrid_observables_gs::general_work(int noutput_items __attribute__((unused) // old_time_debug = out[0][0].RX_time * 1000.0; return 1; } - else - { - return 0; - } } return 0; } diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc index 9615cc40f..78f27282c 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc @@ -162,10 +162,7 @@ bool Gr_Complex_Ip_Packet_Source::start() d_pcap_thread = new boost::thread(boost::bind(&Gr_Complex_Ip_Packet_Source::my_pcap_loop_thread, this, descr)); return true; } - else - { - return false; - } + return false; } diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc index fcb849003..7d6ba7a55 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc @@ -114,10 +114,7 @@ std::string labsat23_source::generate_filename() { return d_signal_file_basename; } - else - { - return std::string("donotexist"); // just to stop processing - } + return std::string("donotexist"); // just to stop processing } std::ostringstream ss; ss << std::setw(4) << std::setfill('0') << d_current_file_number; @@ -458,20 +455,18 @@ int labsat23_source::general_work(int noutput_items, std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl; return 0; } + + if (d_labsat_version == 3) + { + std::cout << "Last file reached, LabSat source stop" << std::endl; + } else { - if (d_labsat_version == 3) - { - std::cout << "Last file reached, LabSat source stop" << std::endl; - } - else - { - std::cout << "End of file reached, LabSat source stop" << std::endl; - } - - d_queue->push(pmt::make_any(command_event_make(200, 0))); - return -1; + std::cout << "End of file reached, LabSat source stop" << std::endl; } + + d_queue->push(pmt::make_any(command_event_make(200, 0))); + return -1; } else { @@ -518,19 +513,17 @@ int labsat23_source::general_work(int noutput_items, std::cout << "Labsat file source is reading samples from " << generate_filename() << std::endl; return 0; } + + if (d_labsat_version == 3) + { + std::cout << "Last file reached, LabSat source stop" << std::endl; + } else { - if (d_labsat_version == 3) - { - std::cout << "Last file reached, LabSat source stop" << std::endl; - } - else - { - std::cout << "End of file reached, LabSat source stop" << std::endl; - } - d_queue->push(pmt::make_any(command_event_make(200, 0))); - return -1; + std::cout << "End of file reached, LabSat source stop" << std::endl; } + d_queue->push(pmt::make_any(command_event_make(200, 0))); + return -1; } else { diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc index 0c273821d..e40bf868e 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc @@ -300,15 +300,8 @@ bool gps_l1_ca_telemetry_decoder_gs::decode_subframe() } return true; } - else - { - return false; - } - } - else - { - return false; } + return false; } diff --git a/src/algorithms/tracking/libs/tracking_discriminators.cc b/src/algorithms/tracking/libs/tracking_discriminators.cc index a4f56d2d6..085145a34 100644 --- a/src/algorithms/tracking/libs/tracking_discriminators.cc +++ b/src/algorithms/tracking/libs/tracking_discriminators.cc @@ -44,7 +44,7 @@ double phase_unwrap(double phase_rad) { return phase_rad - PI; } - else if (phase_rad <= -HALF_PI) + if (phase_rad <= -HALF_PI) { return phase_rad + PI; } diff --git a/src/core/libs/supl/supl.c b/src/core/libs/supl/supl.c index 8cacb8019..25d600ffd 100644 --- a/src/core/libs/supl/supl.c +++ b/src/core/libs/supl/supl.c @@ -333,10 +333,7 @@ static int server_connect(char *server) } return -1; } - else - { - break; - } + break; } freeaddrinfo(aip); return fd;