From c8cd925ba82d76a9d9b8104e83d225cc7a4b0aa3 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 9 Sep 2019 16:00:17 +0200 Subject: [PATCH] Remove bound checking when accessing elements --- .../beidou_b1i_telemetry_decoder_gs.cc | 14 +++++++------- .../beidou_b3i_telemetry_decoder_gs.cc | 14 +++++++------- .../galileo_telemetry_decoder_gs.cc | 12 ++++++------ .../glonass_l1_ca_telemetry_decoder_gs.cc | 4 ++-- .../glonass_l2_ca_telemetry_decoder_gs.cc | 4 ++-- .../gps_l1_ca_telemetry_decoder_gs.cc | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc index b2cc85c53..f3f9e7e21 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc @@ -81,7 +81,7 @@ beidou_b1i_telemetry_decoder_gs::beidou_b1i_telemetry_decoder_gs( // Setting samples of preamble code for (int32_t i = 0; i < d_symbols_per_preamble; i++) { - if (BEIDOU_DNAV_PREAMBLE.at(i) == '1') + if (BEIDOU_DNAV_PREAMBLE[i] == '1') { d_preamble_samples[i] = 1; } @@ -300,7 +300,7 @@ void beidou_b1i_telemetry_decoder_gs::set_satellite(const Gnss_Satellite &satell // Setting samples of preamble code for (int32_t i = 0; i < d_symbols_per_preamble; i++) { - if (BEIDOU_DNAV_PREAMBLE.at(i) == '1') + if (BEIDOU_DNAV_PREAMBLE[i] == '1') { d_preamble_samples[i] = 1; } @@ -325,7 +325,7 @@ void beidou_b1i_telemetry_decoder_gs::set_satellite(const Gnss_Satellite &satell // Setting samples of preamble code for (int32_t i = 0; i < d_symbols_per_preamble; i++) { - if (BEIDOU_DNAV_PREAMBLE.at(i) == '1') + if (BEIDOU_DNAV_PREAMBLE[i] == '1') { d_preamble_samples[i] = 1; } @@ -440,14 +440,14 @@ int beidou_b1i_telemetry_decoder_gs::general_work(int noutput_items __attribute_ { for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++) { - d_subframe_symbols[i] = d_symbol_history.at(i); + d_subframe_symbols[i] = d_symbol_history[i]; } } else // 180 deg. inverted carrier phase PLL lock { for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++) { - d_subframe_symbols[i] = -d_symbol_history.at(i); + d_subframe_symbols[i] = -d_symbol_history[i]; } } @@ -497,14 +497,14 @@ int beidou_b1i_telemetry_decoder_gs::general_work(int noutput_items __attribute_ { for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++) { - d_subframe_symbols[i] = d_symbol_history.at(i); + d_subframe_symbols[i] = d_symbol_history[i]; } } else // 180 deg. inverted carrier phase PLL lock { for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++) { - d_subframe_symbols[i] = -d_symbol_history.at(i); + d_subframe_symbols[i] = -d_symbol_history[i]; } } diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc index 3c79ef4e1..b1e0035d1 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b3i_telemetry_decoder_gs.cc @@ -81,7 +81,7 @@ beidou_b3i_telemetry_decoder_gs::beidou_b3i_telemetry_decoder_gs( // Setting samples of preamble code for (int32_t i = 0; i < d_symbols_per_preamble; i++) { - if (BEIDOU_DNAV_PREAMBLE.at(i) == '1') + if (BEIDOU_DNAV_PREAMBLE[i] == '1') { d_preamble_samples[i] = 1; } @@ -318,7 +318,7 @@ void beidou_b3i_telemetry_decoder_gs::set_satellite( // Setting samples of preamble code for (int32_t i = 0; i < d_symbols_per_preamble; i++) { - if (BEIDOU_DNAV_PREAMBLE.at(i) == '1') + if (BEIDOU_DNAV_PREAMBLE[i] == '1') { d_preamble_samples[i] = 1; } @@ -342,7 +342,7 @@ void beidou_b3i_telemetry_decoder_gs::set_satellite( // Setting samples of preamble code for (int32_t i = 0; i < d_symbols_per_preamble; i++) { - if (BEIDOU_DNAV_PREAMBLE.at(i) == '1') + if (BEIDOU_DNAV_PREAMBLE[i] == '1') { d_preamble_samples[i] = 1; } @@ -466,14 +466,14 @@ int beidou_b3i_telemetry_decoder_gs::general_work( { for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++) { - d_subframe_symbols[i] = d_symbol_history.at(i); + d_subframe_symbols[i] = d_symbol_history[i]; } } else // 180 deg. inverted carrier phase PLL lock { for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++) { - d_subframe_symbols[i] = -d_symbol_history.at(i); + d_subframe_symbols[i] = -d_symbol_history[i]; } } @@ -526,14 +526,14 @@ int beidou_b3i_telemetry_decoder_gs::general_work( { for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++) { - d_subframe_symbols[i] = d_symbol_history.at(i); + d_subframe_symbols[i] = d_symbol_history[i]; } } else // 180 deg. inverted carrier phase PLL lock { for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++) { - d_subframe_symbols[i] = -d_symbol_history.at(i); + d_subframe_symbols[i] = -d_symbol_history[i]; } } diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc index 50674bbb6..87b7a355f 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc @@ -135,7 +135,7 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs( { case 1: // INAV { - if (GALILEO_INAV_PREAMBLE.at(i) == '1') + if (GALILEO_INAV_PREAMBLE[i] == '1') { d_preamble_samples[i] = 1; } @@ -147,7 +147,7 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs( } case 2: // FNAV for E5a-I { - if (GALILEO_FNAV_PREAMBLE.at(i) == '1') + if (GALILEO_FNAV_PREAMBLE[i] == '1') { d_preamble_samples[i] = 1; } @@ -571,14 +571,14 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( { for (uint32_t i = 0; i < d_frame_length_symbols; i++) { - d_page_part_symbols[i] = d_symbol_history.at(i + d_samples_per_preamble); // because last symbol of the preamble is just received now! + d_page_part_symbols[i] = d_symbol_history[i + d_samples_per_preamble]; // because last symbol of the preamble is just received now! } } else // 180 deg. inverted carrier phase PLL lock { for (uint32_t i = 0; i < d_frame_length_symbols; i++) { - d_page_part_symbols[i] = -d_symbol_history.at(i + d_samples_per_preamble); // because last symbol of the preamble is just received now! + d_page_part_symbols[i] = -d_symbol_history[i + d_samples_per_preamble]; // because last symbol of the preamble is just received now! } } decode_INAV_word(d_page_part_symbols.data(), d_frame_length_symbols); @@ -592,7 +592,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( { for (uint32_t i = 0; i < d_frame_length_symbols; i++) { - d_page_part_symbols[i] = d_symbol_history.at(i + d_samples_per_preamble); // because last symbol of the preamble is just received now! + d_page_part_symbols[i] = d_symbol_history[i + d_samples_per_preamble]; // because last symbol of the preamble is just received now! } } } @@ -602,7 +602,7 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__(( { for (uint32_t i = 0; i < d_frame_length_symbols; i++) { - d_page_part_symbols[i] = -d_symbol_history.at(i + d_samples_per_preamble); // because last symbol of the preamble is just received now! + d_page_part_symbols[i] = -d_symbol_history[i + d_samples_per_preamble]; // because last symbol of the preamble is just received now! } } } diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc index f1fb3e9ca..5e3ef08cb 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc @@ -343,11 +343,11 @@ int glonass_l1_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu { if (corr_value > 0) { - string_symbols[i] = d_symbol_history.at(i + d_symbols_per_preamble).Prompt_I; // because last symbol of the preamble is just received now! + string_symbols[i] = d_symbol_history[i + d_symbols_per_preamble].Prompt_I; // because last symbol of the preamble is just received now! } else { - string_symbols[i] = -d_symbol_history.at(i + d_symbols_per_preamble).Prompt_I; // because last symbol of the preamble is just received now! + string_symbols[i] = -d_symbol_history[i + d_symbols_per_preamble].Prompt_I; // because last symbol of the preamble is just received now! } } diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc index e49905811..a960ce236 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc @@ -343,11 +343,11 @@ int glonass_l2_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu { if (corr_value > 0) { - string_symbols[i] = d_symbol_history.at(i + d_symbols_per_preamble).Prompt_I; // because last symbol of the preamble is just received now! + string_symbols[i] = d_symbol_history[i + d_symbols_per_preamble].Prompt_I; // because last symbol of the preamble is just received now! } else { - string_symbols[i] = -d_symbol_history.at(i + d_symbols_per_preamble).Prompt_I; // because last symbol of the preamble is just received now! + string_symbols[i] = -d_symbol_history[i + d_symbols_per_preamble].Prompt_I; // because last symbol of the preamble is just received now! } } 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 f7304a0f4..7738a060c 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 @@ -87,7 +87,7 @@ gps_l1_ca_telemetry_decoder_gs::gps_l1_ca_telemetry_decoder_gs( int32_t n = 0; for (int32_t i = 0; i < d_bits_per_preamble; i++) { - if (GPS_CA_PREAMBLE.at(i) == '1') + if (GPS_CA_PREAMBLE[i] == '1') { d_preamble_samples[n] = 1; n++;