From e836d8f4714cee90deda7b506851c9582344010e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 3 Dec 2023 10:10:40 +0100 Subject: [PATCH] Fix more defects detected by Coverity Scan --- .../apps/volk_gnsssdr_option_helpers.cc | 14 +++++++------- .../volk_gnsssdr/apps/volk_gnsssdr_profile.cc | 2 +- .../volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc | 6 +++--- .../control-plane/in_memory_configuration_test.cc | 5 +++-- ...e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 2 +- .../filter/fir_filter_test.cc | 4 ++-- .../pvt/rinex_printer_test.cc | 8 ++++---- .../sources/file_signal_source_test.cc | 5 +++-- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc index 752359499..f88da8bd7 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc @@ -21,7 +21,7 @@ option_t::option_t(std::string t_longform, void (*t_callback)()) : longform("--" + t_longform), shortform("-" + t_shortform), - msg(t_msg), + msg(std::move(t_msg)), callback(t_callback) { option_type = VOID_CALLBACK; @@ -34,7 +34,7 @@ option_t::option_t(std::string t_longform, void (*t_callback)(int)) : longform("--" + t_longform), shortform("-" + t_shortform), - msg(t_msg), + msg(std::move(t_msg)), callback((void (*)())t_callback) { option_type = INT_CALLBACK; @@ -47,7 +47,7 @@ option_t::option_t(std::string t_longform, void (*t_callback)(float)) : longform("--" + t_longform), shortform("-" + t_shortform), - msg(t_msg), + msg(std::move(t_msg)), callback((void (*)())t_callback) { option_type = FLOAT_CALLBACK; @@ -60,7 +60,7 @@ option_t::option_t(std::string t_longform, void (*t_callback)(bool)) : longform("--" + t_longform), shortform("-" + t_shortform), - msg(t_msg), + msg(std::move(t_msg)), callback((void (*)())t_callback) { option_type = BOOL_CALLBACK; @@ -73,7 +73,7 @@ option_t::option_t(std::string t_longform, void (*t_callback)(std::string)) : longform("--" + t_longform), shortform("-" + t_shortform), - msg(t_msg), + msg(std::move(t_msg)), callback((void (*)())t_callback) { option_type = STRING_CALLBACK; @@ -86,8 +86,8 @@ option_t::option_t(std::string t_longform, std::string t_printval) : longform("--" + t_longform), shortform("-" + t_shortform), - msg(t_msg), - printval(t_printval) + msg(std::move(t_msg)), + printval(std::move(t_printval)) { option_type = STRING; } diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc index f4d248f79..27715f406 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) if (!dry_run) { if (config_file != "") - write_results(&results, false, config_file); + write_results(&results, false, std::move(config_file)); else write_results(&results, false); } diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc index c0105fb21..274d2fd48 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc @@ -33,8 +33,8 @@ int main(int argc, char* argv[]) std::string def_kernel_regex = ""; volk_gnsssdr_test_params_t test_params(def_tol, def_scalar, def_vlen, def_iter, - def_benchmark_mode, def_kernel_regex); - std::vector test_cases = init_test_list(test_params); + def_benchmark_mode, std::move(def_kernel_regex)); + std::vector test_cases = init_test_list(std::move(test_params)); std::vector results; if (argc > 1) { @@ -94,7 +94,7 @@ int main(int argc, char* argv[]) } // Generate XML results - print_qa_xml(results, qa_failures.size()); + print_qa_xml(std::move(results), qa_failures.size()); // Summarize QA results std::cerr << "Kernel QA finished: " << qa_failures.size() << " failures out of " diff --git a/src/tests/unit-tests/control-plane/in_memory_configuration_test.cc b/src/tests/unit-tests/control-plane/in_memory_configuration_test.cc index 4691bc0a0..a51ef89b1 100644 --- a/src/tests/unit-tests/control-plane/in_memory_configuration_test.cc +++ b/src/tests/unit-tests/control-plane/in_memory_configuration_test.cc @@ -18,6 +18,7 @@ #include "configuration_interface.h" #include "gnss_sdr_make_unique.h" #include "in_memory_configuration.h" +#include TEST(InMemoryConfiguration, IsPresent) { @@ -35,7 +36,7 @@ TEST(InMemoryConfiguration, StoreAndRetrieve) auto configuration = std::make_unique(); configuration->set_property("Foo.property1", "value"); std::string default_value = "default_value"; - std::string value = configuration->property("Foo.property1", default_value); + std::string value = configuration->property("Foo.property1", std::move(default_value)); EXPECT_STREQ("value", value.c_str()); } @@ -45,7 +46,7 @@ TEST(InMemoryConfiguration, NoStoringAndRetrieve) // std::shared_ptr configuration = std::make_shared(); auto configuration = std::make_unique(); std::string default_value = "default_value"; - std::string value = configuration->property("Foo.property1", default_value); + std::string value = configuration->property("Foo.property1", std::move(default_value)); EXPECT_STREQ("default_value", value.c_str()); } diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index d90e8b0e9..33d60383e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -225,7 +225,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_1() config = std::make_shared(); - config->set_property("Channel.signal", signal); + config->set_property("Channel.signal", std::move(signal)); config->set_property("GNSS-SDR.internal_fs_sps", std::to_string(fs_in)); config->set_property("SignalSource.fs_hz", std::to_string(fs_in)); config->set_property("SignalSource.item_type", "gr_complex"); diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc index 60987b0f2..ec1b783ef 100644 --- a/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc @@ -267,7 +267,7 @@ TEST_F(FirFilterTest, ConnectAndRunCshorts) config2->set_property("Test_Source.sampling_frequency", "4000000"); std::string path = std::string(TEST_PATH); std::string filename = path + "signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat"; - config2->set_property("Test_Source.filename", filename); + config2->set_property("Test_Source.filename", std::move(filename)); config2->set_property("Test_Source.item_type", "ishort"); config2->set_property("Test_Source.repeat", "true"); @@ -357,7 +357,7 @@ TEST_F(FirFilterTest, ConnectAndRunCbyteGrcomplex) config2->set_property("Test_Source.sampling_frequency", "4000000"); std::string path = std::string(TEST_PATH); std::string filename = path + "signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat"; - config2->set_property("Test_Source.filename", filename); + config2->set_property("Test_Source.filename", std::move(filename)); config2->set_property("Test_Source.item_type", "ibyte"); config2->set_property("Test_Source.repeat", "true"); diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc index ea0aac0bd..754bae627 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc @@ -796,8 +796,8 @@ TEST_F(RinexPrinterTest, MixedObsLog) Pvt_Conf conf; conf.use_e6_for_pvt = false; auto pvt_solution = std::make_shared(rtk, conf, "filename", 9, false, false); - pvt_solution->gps_ephemeris_map[1] = eph_gps; - pvt_solution->galileo_ephemeris_map[1] = eph_gal; + pvt_solution->gps_ephemeris_map[1] = std::move(eph_gps); + pvt_solution->galileo_ephemeris_map[1] = std::move(eph_gal); std::map gnss_observables_map; Gnss_Synchro gs1 = Gnss_Synchro(); @@ -922,8 +922,8 @@ TEST_F(RinexPrinterTest, MixedObsLogGpsGlo) Pvt_Conf conf; conf.use_e6_for_pvt = false; auto pvt_solution = std::make_shared(rtk, conf, "filename", 26, false, false); - pvt_solution->gps_ephemeris_map[1] = eph_gps; - pvt_solution->glonass_gnav_ephemeris_map[1] = eph_glo; + pvt_solution->gps_ephemeris_map[1] = std::move(eph_gps); + pvt_solution->glonass_gnav_ephemeris_map[1] = std::move(eph_glo); std::map gnss_observables_map; Gnss_Synchro gs1 = Gnss_Synchro(); diff --git a/src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc b/src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc index 2057811f4..f07f02835 100644 --- a/src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc @@ -22,6 +22,7 @@ #include #include #include +#include TEST(FileSignalSource, Instantiate) { @@ -32,7 +33,7 @@ TEST(FileSignalSource, Instantiate) config->set_property("Test.sampling_frequency", "0"); std::string path = std::string(TEST_PATH); std::string filename = path + "signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat"; - config->set_property("Test.filename", filename); + config->set_property("Test.filename", std::move(filename)); config->set_property("Test.item_type", "gr_complex"); config->set_property("Test.repeat", "false"); @@ -57,5 +58,5 @@ TEST(FileSignalSource, InstantiateFileNotExists) // connect doesn't matter, since the exception should be thrown sooner than any connections auto top = gr::make_top_block("GNSSUnitTest"); auto uptr = std::make_shared(config.get(), "Test", 0, 1, queue.get()); - EXPECT_THROW({ uptr->connect(top); }, std::exception); + EXPECT_THROW({ uptr->connect(std::move(top)); }, std::exception); }