diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-29 14:29:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-29 14:29:33 -0700 |
| commit | 38b86b237e8d5add213b1c34c054650dfba4835d (patch) | |
| tree | 6d7fdb21643c3438a1b7d1246ab2aaaa68515955 | |
| parent | 886ea8208a37b6ef4d52ca8716ebe2f15a7eed52 (diff) | |
| parent | 3dc18e2378f7406bea5592cbd74c966f39594dfd (diff) | |
Merge remote-tracking branch 'mbr0wn/uhd/coverity' into maint
| -rw-r--r-- | gr-digital/lib/mpsk_snr_est.cc | 1 | ||||
| -rw-r--r-- | gr-digital/lib/ofdm_chanest_vcvc_impl.cc | 2 | ||||
| -rw-r--r-- | gr-digital/lib/pn_correlator_cc_impl.cc | 3 | ||||
| -rw-r--r-- | gr-digital/lib/simple_correlator_impl.cc | 1 | ||||
| -rw-r--r-- | gr-uhd/examples/c++/tags_demo.cc | 3 |
5 files changed, 8 insertions, 2 deletions
diff --git a/gr-digital/lib/mpsk_snr_est.cc b/gr-digital/lib/mpsk_snr_est.cc index 4e7825b894..098e465b2b 100644 --- a/gr-digital/lib/mpsk_snr_est.cc +++ b/gr-digital/lib/mpsk_snr_est.cc @@ -131,6 +131,7 @@ namespace gr { { d_y1 = 0; d_y2 = 0; + d_y3 = 0; d_counter = 1; } diff --git a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc index 8d2c17ca8b..f27107f2db 100644 --- a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc +++ b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc @@ -63,6 +63,8 @@ namespace gr { d_corr_v(sync_symbol2), d_known_symbol_diffs(0, 0), d_new_symbol_diffs(0, 0), + d_first_active_carrier(0), + d_last_active_carrier(sync_symbol2.size()-1), d_interpolate(false) { // Set index of first and last active carrier diff --git a/gr-digital/lib/pn_correlator_cc_impl.cc b/gr-digital/lib/pn_correlator_cc_impl.cc index 649b73be14..fa86de8cfe 100644 --- a/gr-digital/lib/pn_correlator_cc_impl.cc +++ b/gr-digital/lib/pn_correlator_cc_impl.cc @@ -43,7 +43,8 @@ namespace gr { : sync_decimator("pn_correlator_cc", io_signature::make(1, 1, sizeof(gr_complex)), io_signature::make(1, 1, sizeof(gr_complex)), - (unsigned int)((1ULL << degree)-1)) // PN code length + (unsigned int)((1ULL << degree)-1)), // PN code length + d_pn(0.0f) { d_len = (unsigned int)((1ULL << degree)-1); if(mask == 0) diff --git a/gr-digital/lib/simple_correlator_impl.cc b/gr-digital/lib/simple_correlator_impl.cc index 6524e906a4..0e0b05a9a1 100644 --- a/gr-digital/lib/simple_correlator_impl.cc +++ b/gr-digital/lib/simple_correlator_impl.cc @@ -51,6 +51,7 @@ namespace gr { io_signature::make(1, 1, sizeof(unsigned char))), d_payload_bytesize(payload_bytesize), d_state(ST_LOOKING), d_osi(0), + d_transition_osi(0), d_center_osi(0), d_bblen((payload_bytesize + GRSF_PAYLOAD_OVERHEAD) * GRSF_BITS_PER_BYTE), d_bitbuf(new unsigned char[d_bblen]), d_pktbuf(new unsigned char[d_bblen/GRSF_BITS_PER_BYTE]), diff --git a/gr-uhd/examples/c++/tags_demo.cc b/gr-uhd/examples/c++/tags_demo.cc index 787e3d2e4b..42cbb46874 100644 --- a/gr-uhd/examples/c++/tags_demo.cc +++ b/gr-uhd/examples/c++/tags_demo.cc @@ -24,6 +24,7 @@ #include <gnuradio/uhd/usrp_sink.h> #include <tag_source_demo.h> #include <tag_sink_demo.h> +#include <uhd/utils/safe_main.hpp> #include <boost/make_shared.hpp> #include <boost/thread/thread.hpp> //sleep #include <boost/program_options.hpp> @@ -41,7 +42,7 @@ void sig_int_handler(int){stop_signal_called = true;} /*********************************************************************** * Main w/ program options **********************************************************************/ -int main(int argc, char *argv[]){ +int UHD_SAFE_MAIN(int argc, char *argv[]){ std::string device_addr, length_tag; double center_freq, samp_rate, burst_dur, idle_dur; |