diff options
| author | andriy gelman <andriy.gelman@gmail.com> | 2018-02-21 17:57:55 -0500 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-04-28 15:54:32 +0200 |
| commit | 3d244b94cf4612a87e0d95e5ab24da4a5fc6aae2 (patch) | |
| tree | b4423e82d710ff8e1a7ec8a7ffbd1e795d9adcdc | |
| parent | e0beb54aac18de2f1c3f5076213f03bbe096cd59 (diff) | |
Clean-up: Remove unused private variables (Issue #1621, #1622, #1624)
67 files changed, 24 insertions, 101 deletions
diff --git a/.gitignore b/.gitignore index a18599872b..4f806c77e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ *~ *.pyc *.pyo +cscope.files +cscope.in.out +cscope.out +cscope.po.out build/ diff --git a/gr-analog/lib/feedforward_agc_cc_impl.cc b/gr-analog/lib/feedforward_agc_cc_impl.cc index 9870c7c3c0..1a7ba7b9c4 100644 --- a/gr-analog/lib/feedforward_agc_cc_impl.cc +++ b/gr-analog/lib/feedforward_agc_cc_impl.cc @@ -54,12 +54,6 @@ namespace gr { { } - inline static float - mag_squared(gr_complex x) - { - return x.real() * x.real() + x.imag() * x.imag(); - } - // approximate sqrt(x^2 + y^2) inline static float envelope(gr_complex x) diff --git a/gr-blocks/lib/annotator_1to1_impl.cc b/gr-blocks/lib/annotator_1to1_impl.cc index 04f9a2f458..17ef134677 100644 --- a/gr-blocks/lib/annotator_1to1_impl.cc +++ b/gr-blocks/lib/annotator_1to1_impl.cc @@ -44,7 +44,7 @@ namespace gr { : sync_block("annotator_1to1", io_signature::make(1, -1, sizeof_stream_item), io_signature::make(1, -1, sizeof_stream_item)), - d_itemsize(sizeof_stream_item), d_when((uint64_t)when) + d_when((uint64_t)when) { set_tag_propagation_policy(TPP_ONE_TO_ONE); diff --git a/gr-blocks/lib/annotator_1to1_impl.h b/gr-blocks/lib/annotator_1to1_impl.h index 2da73c8a66..206366ca17 100644 --- a/gr-blocks/lib/annotator_1to1_impl.h +++ b/gr-blocks/lib/annotator_1to1_impl.h @@ -31,7 +31,6 @@ namespace gr { class annotator_1to1_impl : public annotator_1to1 { private: - size_t d_itemsize; uint64_t d_when; uint64_t d_tag_counter; std::vector<tag_t> d_stored_tags; diff --git a/gr-blocks/lib/annotator_alltoall_impl.cc b/gr-blocks/lib/annotator_alltoall_impl.cc index cedf8dd44f..a70e955f77 100644 --- a/gr-blocks/lib/annotator_alltoall_impl.cc +++ b/gr-blocks/lib/annotator_alltoall_impl.cc @@ -45,7 +45,7 @@ namespace gr { : sync_block("annotator_alltoall", io_signature::make(1, -1, sizeof_stream_item), io_signature::make(1, -1, sizeof_stream_item)), - d_itemsize(sizeof_stream_item), d_when((uint64_t)when) + d_when((uint64_t)when) { set_tag_propagation_policy(TPP_ALL_TO_ALL); diff --git a/gr-blocks/lib/annotator_alltoall_impl.h b/gr-blocks/lib/annotator_alltoall_impl.h index 81b73a8972..cdd5c88e62 100644 --- a/gr-blocks/lib/annotator_alltoall_impl.h +++ b/gr-blocks/lib/annotator_alltoall_impl.h @@ -31,7 +31,6 @@ namespace gr { class annotator_alltoall_impl : public annotator_alltoall { private: - size_t d_itemsize; uint64_t d_when; uint64_t d_tag_counter; std::vector<tag_t> d_stored_tags; diff --git a/gr-blocks/lib/interleaved_char_to_complex_impl.cc b/gr-blocks/lib/interleaved_char_to_complex_impl.cc index b16e3c4c73..ab6364a6d4 100644 --- a/gr-blocks/lib/interleaved_char_to_complex_impl.cc +++ b/gr-blocks/lib/interleaved_char_to_complex_impl.cc @@ -40,8 +40,7 @@ namespace gr { : sync_decimator("interleaved_char_to_complex", gr::io_signature::make (1, 1, (vector_input?2:1)*sizeof(char)), gr::io_signature::make (1, 1, sizeof(gr_complex)), - vector_input?1:2), - d_vector_input(vector_input) + vector_input?1:2) { const int alignment_multiple = volk_get_alignment() / sizeof(gr_complex); diff --git a/gr-blocks/lib/interleaved_char_to_complex_impl.h b/gr-blocks/lib/interleaved_char_to_complex_impl.h index 484c33c9f4..f07805788c 100644 --- a/gr-blocks/lib/interleaved_char_to_complex_impl.h +++ b/gr-blocks/lib/interleaved_char_to_complex_impl.h @@ -31,7 +31,6 @@ namespace gr { class BLOCKS_API interleaved_char_to_complex_impl : public interleaved_char_to_complex { private: - bool d_vector_input; public: interleaved_char_to_complex_impl(bool vector_input=false); diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.cc b/gr-blocks/lib/interleaved_short_to_complex_impl.cc index 6c7108b550..ca0dfc9064 100644 --- a/gr-blocks/lib/interleaved_short_to_complex_impl.cc +++ b/gr-blocks/lib/interleaved_short_to_complex_impl.cc @@ -41,7 +41,7 @@ namespace gr { gr::io_signature::make (1, 1, (vector_input?2:1)*sizeof(short)), gr::io_signature::make (1, 1, sizeof(gr_complex)), vector_input?1:2), - d_vector_input(vector_input), d_swap(swap) + d_swap(swap) { } diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.h b/gr-blocks/lib/interleaved_short_to_complex_impl.h index 8370786187..7a3ca419c9 100644 --- a/gr-blocks/lib/interleaved_short_to_complex_impl.h +++ b/gr-blocks/lib/interleaved_short_to_complex_impl.h @@ -31,7 +31,6 @@ namespace gr { class BLOCKS_API interleaved_short_to_complex_impl : public interleaved_short_to_complex { private: - bool d_vector_input; bool d_swap; public: interleaved_short_to_complex_impl(bool vector_input=false, bool swap=false); diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc index 0c48442fa7..baf16aa599 100644 --- a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc +++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc @@ -43,7 +43,6 @@ namespace gr { io_signature::make(1, 1, pdu::itemsize(type)), tsb_tag_key), d_itemsize(pdu::itemsize(type)), - d_type(type), d_curr_len(0) { message_port_register_in(PDU_PORT_ID); diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.h b/gr-blocks/lib/pdu_to_tagged_stream_impl.h index 99f68147c8..bce8122b13 100644 --- a/gr-blocks/lib/pdu_to_tagged_stream_impl.h +++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.h @@ -31,7 +31,6 @@ namespace gr { class BLOCKS_API pdu_to_tagged_stream_impl : public pdu_to_tagged_stream { size_t d_itemsize; - pdu::vector_type d_type; pmt::pmt_t d_curr_meta; pmt::pmt_t d_curr_vect; size_t d_curr_len; diff --git a/gr-blocks/lib/peak_detector2_fb_impl.h b/gr-blocks/lib/peak_detector2_fb_impl.h index 4e16c93dac..929e302d68 100644 --- a/gr-blocks/lib/peak_detector2_fb_impl.h +++ b/gr-blocks/lib/peak_detector2_fb_impl.h @@ -33,7 +33,6 @@ namespace gr { private: float d_threshold_factor_rise; int d_look_ahead; - int d_look_ahead_remaining; int d_peak_ind; float d_peak_val; float d_alpha; diff --git a/gr-blocks/lib/peak_detector_XX_impl.cc.t b/gr-blocks/lib/peak_detector_XX_impl.cc.t index 3ad5f3c8fe..bc4136143d 100644 --- a/gr-blocks/lib/peak_detector_XX_impl.cc.t +++ b/gr-blocks/lib/peak_detector_XX_impl.cc.t @@ -53,7 +53,7 @@ namespace gr { io_signature::make(1, 1, sizeof(char))), d_threshold_factor_rise(threshold_factor_rise), d_threshold_factor_fall(threshold_factor_fall), - d_look_ahead(look_ahead), d_avg_alpha(alpha), d_avg(0), d_found(0) + d_look_ahead(look_ahead), d_avg_alpha(alpha), d_avg(0) { } diff --git a/gr-blocks/lib/peak_detector_XX_impl.h.t b/gr-blocks/lib/peak_detector_XX_impl.h.t index 22de961d32..aa04794536 100644 --- a/gr-blocks/lib/peak_detector_XX_impl.h.t +++ b/gr-blocks/lib/peak_detector_XX_impl.h.t @@ -38,7 +38,6 @@ namespace gr { int d_look_ahead; float d_avg_alpha; float d_avg; - unsigned char d_found; public: @NAME_IMPL@(float threshold_factor_rise, diff --git a/gr-blocks/lib/probe_rate_impl.cc b/gr-blocks/lib/probe_rate_impl.cc index 015b157d39..fb08b7dd99 100644 --- a/gr-blocks/lib/probe_rate_impl.cc +++ b/gr-blocks/lib/probe_rate_impl.cc @@ -45,8 +45,7 @@ namespace gr { d_beta(1.0-alpha), d_avg(0), d_min_update_time(update_rate_ms), - d_lastthru(0), - d_itemsize(itemsize) + d_lastthru(0) { message_port_register_out(pmt::mp("rate")); } diff --git a/gr-blocks/lib/probe_rate_impl.h b/gr-blocks/lib/probe_rate_impl.h index a1c69ba189..ae4876dfa8 100644 --- a/gr-blocks/lib/probe_rate_impl.h +++ b/gr-blocks/lib/probe_rate_impl.h @@ -35,7 +35,6 @@ namespace gr { double d_min_update_time; boost::posix_time::ptime d_last_update; uint64_t d_lastthru; - size_t d_itemsize; void setup_rpc(); public: diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h index 1df99fdeff..ad42996cd1 100644 --- a/gr-blocks/lib/socket_pdu_impl.h +++ b/gr-blocks/lib/socket_pdu_impl.h @@ -37,7 +37,6 @@ namespace gr { void run_io_service() { d_io_service.run(); } gr::thread::thread d_thread; bool d_started; - bool d_finished; // TCP specific boost::asio::ip::tcp::endpoint d_tcp_endpoint; diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index ea2f2b60a0..6081690259 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -56,7 +56,7 @@ namespace gr { io_signature::make(0, 0, 0), io_signature::make(1, 1, itemsize)), d_itemsize(itemsize), d_payload_size(payload_size), - d_eof(eof), d_connected(false), d_residual(0), d_sent(0), d_offset(0) + d_eof(eof), d_connected(false), d_residual(0), d_sent(0) { // Give us some more room to play. d_rxbuf = new char[4*d_payload_size]; diff --git a/gr-blocks/lib/udp_source_impl.h b/gr-blocks/lib/udp_source_impl.h index 42cb64dabe..5b4b6996ab 100644 --- a/gr-blocks/lib/udp_source_impl.h +++ b/gr-blocks/lib/udp_source_impl.h @@ -42,7 +42,6 @@ namespace gr { char *d_residbuf; // hold buffer between calls ssize_t d_residual; // hold information about number of bytes stored in residbuf ssize_t d_sent; // track how much of d_residbuf we've outputted - size_t d_offset; // point to residbuf location offset static const int BUF_SIZE_PAYLOADS; //!< The d_residbuf size in multiples of d_payload_size diff --git a/gr-blocks/lib/vector_source_X_impl.cc.t b/gr-blocks/lib/vector_source_X_impl.cc.t index 287864fcac..82e157268c 100644 --- a/gr-blocks/lib/vector_source_X_impl.cc.t +++ b/gr-blocks/lib/vector_source_X_impl.cc.t @@ -53,8 +53,7 @@ namespace gr { d_repeat(repeat), d_offset(0), d_vlen(vlen), - d_tags(tags), - d_tagpos(0) + d_tags(tags) { if(tags.size() == 0) { d_settags = 0; diff --git a/gr-blocks/lib/vector_source_X_impl.h.t b/gr-blocks/lib/vector_source_X_impl.h.t index bc9b329d8f..07bfc53e63 100644 --- a/gr-blocks/lib/vector_source_X_impl.h.t +++ b/gr-blocks/lib/vector_source_X_impl.h.t @@ -39,7 +39,6 @@ namespace gr { int d_vlen; bool d_settags; std::vector<tag_t> d_tags; - unsigned int d_tagpos; public: @NAME_IMPL@(const std::vector<@TYPE@> &data, diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc index a8911e8a17..3e69ecee3e 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.cc +++ b/gr-digital/lib/constellation_receiver_cb_impl.cc @@ -54,8 +54,7 @@ namespace gr { io_signature::make(1, 1, sizeof(gr_complex)), io_signature::makev(1, 5, iosig)), blocks::control_loop(loop_bw, fmax, fmin), - d_constellation(constellation), - d_current_const_point(0) + d_constellation(constellation) { if(d_constellation->dimensionality() != 1) throw std::runtime_error("This receiver only works with constellations of dimension 1."); diff --git a/gr-digital/lib/constellation_receiver_cb_impl.h b/gr-digital/lib/constellation_receiver_cb_impl.h index b07f2ff8f5..834ff0f5fe 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.h +++ b/gr-digital/lib/constellation_receiver_cb_impl.h @@ -52,7 +52,6 @@ namespace gr { private: constellation_sptr d_constellation; - unsigned int d_current_const_point; //! Set the phase and the frequency. //! Typically used when we receive a tag with values for these. @@ -83,8 +82,6 @@ namespace gr { //! delay line plus some length for overflow protection __GR_ATTR_ALIGNED(8) gr_complex d_dl[2*DLLEN]; - //! index to delay line - unsigned int d_dl_idx; }; } /* namespace digital */ diff --git a/gr-digital/lib/crc32_async_bb_impl.cc b/gr-digital/lib/crc32_async_bb_impl.cc index 0c3bdf70cc..e5c8096d28 100644 --- a/gr-digital/lib/crc32_async_bb_impl.cc +++ b/gr-digital/lib/crc32_async_bb_impl.cc @@ -42,7 +42,7 @@ namespace gr { : block("crc32_async_bb", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)), - d_check(check), d_npass(0), d_nfail(0) + d_npass(0), d_nfail(0) { d_in_port = pmt::mp("in"); d_out_port = pmt::mp("out"); diff --git a/gr-digital/lib/crc32_async_bb_impl.h b/gr-digital/lib/crc32_async_bb_impl.h index 6ec0e8ee50..59efa8cdbd 100644 --- a/gr-digital/lib/crc32_async_bb_impl.h +++ b/gr-digital/lib/crc32_async_bb_impl.h @@ -32,7 +32,6 @@ namespace gr { class crc32_async_bb_impl : public crc32_async_bb { private: - bool d_check; boost::crc_optimal<32, 0x04C11DB7, 0xFFFFFFFF, 0xFFFFFFFF, true, true> d_crc_impl; pmt::pmt_t d_in_port; diff --git a/gr-digital/lib/msk_timing_recovery_cc_impl.h b/gr-digital/lib/msk_timing_recovery_cc_impl.h index 02c29dc6ec..b0791a5fb0 100644 --- a/gr-digital/lib/msk_timing_recovery_cc_impl.h +++ b/gr-digital/lib/msk_timing_recovery_cc_impl.h @@ -38,12 +38,10 @@ namespace gr { float d_gain; float d_limit; filter::mmse_fir_interpolator_cc *d_interp; - filter::kernel::fir_filter_with_buffer_fff *d_decim; gr_complex d_dly_conj_1, d_dly_conj_2, d_dly_diff_1; float d_mu, d_omega, d_gain_omega; int d_div; int d_osps; - int d_loop_rate; public: msk_timing_recovery_cc_impl(float sps, float gain, float limit, int osps); diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.h b/gr-digital/lib/pfb_clock_sync_ccf_impl.h index b23b8fefa4..09f47352af 100644 --- a/gr-digital/lib/pfb_clock_sync_ccf_impl.h +++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.h @@ -35,7 +35,6 @@ namespace gr { private: bool d_updated; double d_sps; - double d_sample_num; float d_loop_bw; float d_damping; float d_alpha; diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.h b/gr-digital/lib/pfb_clock_sync_fff_impl.h index 7bbbd995d1..cca58a376a 100644 --- a/gr-digital/lib/pfb_clock_sync_fff_impl.h +++ b/gr-digital/lib/pfb_clock_sync_fff_impl.h @@ -35,7 +35,6 @@ namespace gr { private: bool d_updated; double d_sps; - double d_sample_num; float d_loop_bw; float d_damping; float d_alpha; diff --git a/gr-digital/lib/simple_framer_impl.cc b/gr-digital/lib/simple_framer_impl.cc index 0f8a068276..218ba85269 100644 --- a/gr-digital/lib/simple_framer_impl.cc +++ b/gr-digital/lib/simple_framer_impl.cc @@ -44,7 +44,7 @@ namespace gr { : block("simple_framer", io_signature::make(1, 1, sizeof(unsigned char)), io_signature::make(1, 1, sizeof(unsigned char))), - d_seqno (0), d_payload_bytesize (payload_bytesize), + d_seqno (0), d_input_block_size (payload_bytesize), d_output_block_size (payload_bytesize + GRSF_OVERHEAD) { diff --git a/gr-digital/lib/simple_framer_impl.h b/gr-digital/lib/simple_framer_impl.h index 25dda4429e..8002a6002a 100644 --- a/gr-digital/lib/simple_framer_impl.h +++ b/gr-digital/lib/simple_framer_impl.h @@ -32,7 +32,6 @@ namespace gr { { private: int d_seqno; - int d_payload_bytesize; int d_input_block_size; // bytes int d_output_block_size; // bytes diff --git a/gr-digital/lib/timing_error_detector.cc b/gr-digital/lib/timing_error_detector.cc index 9eb6289449..d212fb4875 100644 --- a/gr-digital/lib/timing_error_detector.cc +++ b/gr-digital/lib/timing_error_detector.cc @@ -79,8 +79,7 @@ namespace gr { bool needs_lookahead, bool needs_derivative, constellation_sptr constellation) - : d_type(type), - d_constellation(constellation), + : d_constellation(constellation), d_error(0.0f), d_prev_error(0.0f), d_inputs_per_symbol(inputs_per_symbol), diff --git a/gr-digital/lib/timing_error_detector.h b/gr-digital/lib/timing_error_detector.h index ad04d72c2b..14c0120471 100644 --- a/gr-digital/lib/timing_error_detector.h +++ b/gr-digital/lib/timing_error_detector.h @@ -143,7 +143,6 @@ namespace gr { virtual void sync_reset(); private: - enum ted_type d_type; protected: /*! diff --git a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc index b8ee91a52d..a0ca0c1c07 100644 --- a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc +++ b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc @@ -38,7 +38,6 @@ namespace gr { static const int rs_init_nroots = 20; static const int N = (1 << rs_init_symsize) - 1; // 255 - static const int K = N - rs_init_nroots; // 235 static const int amount_of_pad = N - ATSC_MPEG_RS_ENCODED_LENGTH; // 48 diff --git a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h index adbc4879a9..c657e699dc 100644 --- a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h +++ b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h @@ -39,7 +39,6 @@ namespace gr { int d_nerrors_corrrected_count; int d_bad_packet_count; int d_total_packets; - int d_total_bits; void *d_rs; public: diff --git a/gr-dtv/lib/atsc/atsc_sync_impl.cc b/gr-dtv/lib/atsc/atsc_sync_impl.cc index b4de5fca56..fe2f0ea3eb 100644 --- a/gr-dtv/lib/atsc/atsc_sync_impl.cc +++ b/gr-dtv/lib/atsc/atsc_sync_impl.cc @@ -49,7 +49,7 @@ namespace gr { : gr::block("dtv_atsc_sync", io_signature::make(1, 1, sizeof(float)), io_signature::make(1, 1, sizeof(atsc_soft_data_segment))), - d_next_input(0), d_rx_clock_to_symbol_freq(rate/ATSC_SYMBOL_RATE), + d_rx_clock_to_symbol_freq(rate/ATSC_SYMBOL_RATE), d_si(0) { d_loop.set_taps(LOOP_FILTER_TAP); diff --git a/gr-dtv/lib/atsc/atsc_sync_impl.h b/gr-dtv/lib/atsc/atsc_sync_impl.h index 670cb311e1..cf5fccd1b3 100644 --- a/gr-dtv/lib/atsc/atsc_sync_impl.h +++ b/gr-dtv/lib/atsc/atsc_sync_impl.h @@ -37,7 +37,6 @@ namespace gr { gr::filter::single_pole_iir<float,float,float> d_loop; // ``VCO'' loop filter gr::filter::mmse_fir_interpolator_ff d_interp; - unsigned long long d_next_input; double d_rx_clock_to_symbol_freq; int d_si; double d_w; // ratio of PERIOD of Tx to Rx clocks diff --git a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h index ef4faab313..e52aea7fa0 100644 --- a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h +++ b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h @@ -49,7 +49,6 @@ namespace gr { class atsc_viterbi_decoder_impl : public atsc_viterbi_decoder { private: - int last_start; typedef interleaver_fifo<unsigned char> fifo_t; static const int SEGMENT_SIZE = ATSC_MPEG_RS_ENCODED_LENGTH; // 207 diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc index e29ec8cfe2..ee440bc789 100644 --- a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc @@ -43,7 +43,7 @@ namespace gr { : sync_interpolator("dvbt_convolutional_interleaver", io_signature::make(1, 1, sizeof (unsigned char) * I * blocks), io_signature::make(1, 1, sizeof (unsigned char)), I * blocks), - d_blocks(blocks), d_I(I), d_M(M) + d_I(I), d_M(M) { //Positions are shift registers (FIFOs) //of length i*M diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h index 2de1fab282..391e0ef77c 100644 --- a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h @@ -31,7 +31,6 @@ namespace gr { class dvbt_convolutional_interleaver_impl : public dvbt_convolutional_interleaver { private: - int d_blocks; int d_I; int d_M; std::vector< std::deque<unsigned char> * > d_shift; diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc index e26c0eb8d9..5384b6ac87 100644 --- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc @@ -131,8 +131,7 @@ namespace gr { io_signature::make(1, 1, sizeof (unsigned char) * noutput)), config(constellation, hierarchy, coderate, coderate), d_ninput(ninput), d_noutput(noutput), - d_reg(0), - d_bitcount(0) + d_reg(0) { //Determine k - input of encoder d_k = config.d_cr_k; diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h index d472b1f60c..7c31c1897d 100644 --- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h @@ -40,10 +40,6 @@ namespace gr { int d_reg; - //counts the bits in the bytes - //in input stream - int d_bitcount; - // Code rate k/n int d_k; int d_n; diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc index 079d948163..afd338a8fc 100644 --- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc @@ -235,7 +235,7 @@ namespace gr { : block("dvbt_ofdm_sym_acquisition", io_signature::make(1, 1, sizeof (gr_complex) * blocks), io_signature::make(1, 1, sizeof (gr_complex) * blocks * fft_length)), - d_blocks(blocks), d_fft_length(fft_length), d_cp_length(cp_length), d_snr(snr), \ + d_fft_length(fft_length), d_cp_length(cp_length), d_snr(snr), \ d_phase(0.0), d_phaseinc(0.0), d_cp_found(0), d_nextphaseinc(0), d_nextpos(0), \ d_initial_acquisition(0), d_cp_start(0), \ d_to_consume(0), d_to_out(0), d_consumed(0), d_out(0) diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h index 0964361b1e..e4fe1dc50a 100644 --- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h @@ -29,7 +29,6 @@ namespace gr { class dvbt_ofdm_sym_acquisition_impl : public dvbt_ofdm_sym_acquisition { private: - int d_blocks; int d_fft_length; int d_cp_length; float d_snr; diff --git a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h index 2d9b24809d..39a45c4521 100644 --- a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h @@ -41,7 +41,6 @@ namespace gr { int d_nerrors_corrected_count; int d_bad_packet_count; int d_total_packets; - int d_total_bits; void *d_rs; /* Reed-Solomon characteristics structure */ int decode(unsigned char &out, const unsigned char &in); diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc index 8d20a43142..4e41d50c3b 100644 --- a/gr-fec/lib/async_decoder_impl.cc +++ b/gr-fec/lib/async_decoder_impl.cc @@ -46,8 +46,7 @@ namespace gr { int mtu) : block("async_decoder", io_signature::make(0,0,0), - io_signature::make(0,0,0)), - d_input_item_size(sizeof(float)), d_output_item_size(sizeof(char)) + io_signature::make(0,0,0)) { d_in_port = pmt::mp("in"); d_out_port = pmt::mp("out"); diff --git a/gr-fec/lib/async_decoder_impl.h b/gr-fec/lib/async_decoder_impl.h index abbe55e105..bb108d5cad 100644 --- a/gr-fec/lib/async_decoder_impl.h +++ b/gr-fec/lib/async_decoder_impl.h @@ -33,8 +33,6 @@ namespace gr { { private: generic_decoder::sptr d_decoder; - size_t d_input_item_size; - size_t d_output_item_size; pmt::pmt_t d_in_port; pmt::pmt_t d_out_port; diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc index 346160b26c..c7eb3bfb9b 100644 --- a/gr-fec/lib/async_encoder_impl.cc +++ b/gr-fec/lib/async_encoder_impl.cc @@ -46,8 +46,7 @@ namespace gr { int mtu) : block("async_encoder", io_signature::make(0,0,0), - io_signature::make(0,0,0)), - d_input_item_size(sizeof(char)), d_output_item_size(sizeof(char)) + io_signature::make(0,0,0)) { d_in_port = pmt::mp("in"); d_out_port = pmt::mp("out"); diff --git a/gr-fec/lib/async_encoder_impl.h b/gr-fec/lib/async_encoder_impl.h index 265054370d..9e130d8e79 100644 --- a/gr-fec/lib/async_encoder_impl.h +++ b/gr-fec/lib/async_encoder_impl.h @@ -34,8 +34,6 @@ namespace gr { { private: generic_encoder::sptr d_encoder; - size_t d_input_item_size; - size_t d_output_item_size; pmt::pmt_t d_in_port; pmt::pmt_t d_out_port; diff --git a/gr-fec/lib/cc_decoder_impl.cc b/gr-fec/lib/cc_decoder_impl.cc index 21af22e36f..c65e67706b 100644 --- a/gr-fec/lib/cc_decoder_impl.cc +++ b/gr-fec/lib/cc_decoder_impl.cc @@ -54,7 +54,6 @@ namespace gr { : generic_decoder("cc_decoder"), d_k(k), d_rate(rate), - d_partial_rate(rate), d_polys(polys), d_mode(mode), d_padding(0), diff --git a/gr-fec/lib/cc_decoder_impl.h b/gr-fec/lib/cc_decoder_impl.h index 643f4b8717..1015bc3d98 100644 --- a/gr-fec/lib/cc_decoder_impl.h +++ b/gr-fec/lib/cc_decoder_impl.h @@ -51,7 +51,6 @@ namespace gr { int chainback_viterbi(unsigned char* data, unsigned int nbits, unsigned int endstate, unsigned int tailsize); int find_endstate(); - int tester[12]; unsigned char *Branchtab; unsigned char Partab[256]; @@ -64,7 +63,6 @@ namespace gr { unsigned int d_frame_size; unsigned int d_k; unsigned int d_rate; - unsigned int d_partial_rate; std::vector<int> d_polys; cc_mode_t d_mode; int d_padding; diff --git a/gr-fec/lib/cc_encoder_impl.h b/gr-fec/lib/cc_encoder_impl.h index 77d5f42462..887553b6fa 100644 --- a/gr-fec/lib/cc_encoder_impl.h +++ b/gr-fec/lib/cc_encoder_impl.h @@ -46,9 +46,6 @@ namespace gr { unsigned int d_rate; unsigned int d_k; std::vector<int> d_polys; - struct v* d_vp; - int d_numstates; - int d_decision_t_size; int d_start_state; cc_mode_t d_mode; int d_padding; diff --git a/gr-fec/lib/scl_list.cc b/gr-fec/lib/scl_list.cc index ab6e81d317..c01f493f50 100644 --- a/gr-fec/lib/scl_list.cc +++ b/gr-fec/lib/scl_list.cc @@ -34,7 +34,7 @@ namespace gr { scl_list::scl_list(const unsigned int size, const unsigned int block_size, const unsigned int block_power): - d_list_size(size), d_block_size(block_size), d_block_power(block_power), + d_list_size(size), d_num_buff_elements(block_size * (block_power + 1)) { for(unsigned int i = 0; i < 2 * size; i++){ diff --git a/gr-fec/lib/scl_list.h b/gr-fec/lib/scl_list.h index 8f3fa66ac1..60e5cae8cd 100644 --- a/gr-fec/lib/scl_list.h +++ b/gr-fec/lib/scl_list.h @@ -46,8 +46,6 @@ namespace gr { */ class scl_list{ const unsigned int d_list_size; - const unsigned int d_block_size; - const unsigned int d_block_power; const unsigned int d_num_buff_elements; std::vector<path*> d_path_list; unsigned int d_active_path_counter; diff --git a/gr-fec/lib/tagged_decoder_impl.cc b/gr-fec/lib/tagged_decoder_impl.cc index 989a7a726b..3fc6508d0b 100644 --- a/gr-fec/lib/tagged_decoder_impl.cc +++ b/gr-fec/lib/tagged_decoder_impl.cc @@ -53,7 +53,6 @@ namespace gr { io_signature::make(1, 1, input_item_size), io_signature::make(1, 1, output_item_size), lengthtagname), - d_input_item_size(input_item_size), d_output_item_size(output_item_size), d_mtu(mtu) { d_decoder = my_decoder; diff --git a/gr-fec/lib/tagged_decoder_impl.h b/gr-fec/lib/tagged_decoder_impl.h index 08af956334..d6ad10d5fa 100644 --- a/gr-fec/lib/tagged_decoder_impl.h +++ b/gr-fec/lib/tagged_decoder_impl.h @@ -32,8 +32,6 @@ namespace gr { { private: generic_decoder::sptr d_decoder; - size_t d_input_item_size; - size_t d_output_item_size; int d_mtu; public: diff --git a/gr-fec/lib/tagged_encoder_impl.cc b/gr-fec/lib/tagged_encoder_impl.cc index 3870fc51aa..f6757c2647 100644 --- a/gr-fec/lib/tagged_encoder_impl.cc +++ b/gr-fec/lib/tagged_encoder_impl.cc @@ -53,7 +53,6 @@ namespace gr { io_signature::make(1, 1, input_item_size), io_signature::make(1, 1, output_item_size), lengthtagname), - d_input_item_size(input_item_size), d_output_item_size(output_item_size), d_mtu(mtu) { d_encoder = my_encoder; diff --git a/gr-fec/lib/tagged_encoder_impl.h b/gr-fec/lib/tagged_encoder_impl.h index a119607789..b9363d1754 100644 --- a/gr-fec/lib/tagged_encoder_impl.h +++ b/gr-fec/lib/tagged_encoder_impl.h @@ -32,8 +32,6 @@ namespace gr { { private: generic_encoder::sptr d_encoder; - size_t d_input_item_size; - size_t d_output_item_size; int d_mtu; public: diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc index 7e327ea916..b635c3b9bd 100644 --- a/gr-fft/lib/fft_vfc_fftw.cc +++ b/gr-fft/lib/fft_vfc_fftw.cc @@ -49,7 +49,7 @@ namespace gr { io_signature::make(1, 1, fft_size * sizeof(gr_complex))), d_fft_size(fft_size), d_forward(forward) { - d_fft = new fft_complex(d_fft_size, forward, nthreads); + d_fft = new fft_complex(d_fft_size, d_forward, nthreads); if(!set_window(window)) throw std::runtime_error("fft_vfc: window not the same length as fft_size\n"); } diff --git a/gr-trellis/lib/pccc_decoder_X_impl.cc.t b/gr-trellis/lib/pccc_decoder_X_impl.cc.t index aa19884712..4f80598540 100644 --- a/gr-trellis/lib/pccc_decoder_X_impl.cc.t +++ b/gr-trellis/lib/pccc_decoder_X_impl.cc.t @@ -34,8 +34,6 @@ namespace gr { namespace trellis { - static const float INF = 1.0e9; - @BASE_NAME@::sptr @BASE_NAME@::make(const fsm &FSM1, int ST10, int ST1K, const fsm &FSM2, int ST20, int ST2K, diff --git a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t index 5b3cdeeb62..6841066416 100644 --- a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t +++ b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t @@ -34,8 +34,6 @@ namespace gr { namespace trellis { - static const float INF = 1.0e9; - @BASE_NAME@::sptr @BASE_NAME@::make(const fsm &FSMo, int STo0, int SToK, const fsm &FSMi, int STi0, int STiK, diff --git a/gr-trellis/lib/sccc_decoder_X_impl.cc.t b/gr-trellis/lib/sccc_decoder_X_impl.cc.t index d217bbccfb..6f1bac585a 100644 --- a/gr-trellis/lib/sccc_decoder_X_impl.cc.t +++ b/gr-trellis/lib/sccc_decoder_X_impl.cc.t @@ -34,8 +34,6 @@ namespace gr { namespace trellis { - static const float INF = 1.0e9; - @BASE_NAME@::sptr @BASE_NAME@::make(const fsm &FSMo, int STo0, int SToK, const fsm &FSMi, int STi0, int STiK, diff --git a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t index f66b1f37e7..224c5f8027 100644 --- a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t +++ b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t @@ -34,8 +34,6 @@ namespace gr { namespace trellis { - static const float INF = 1.0e9; - @BASE_NAME@::sptr @BASE_NAME@::make(const fsm &FSMo, int STo0, int SToK, const fsm &FSMi, int STi0, int STiK, diff --git a/gr-trellis/lib/siso_combined_f_impl.cc b/gr-trellis/lib/siso_combined_f_impl.cc index 3b89684bf0..3941a7bbca 100644 --- a/gr-trellis/lib/siso_combined_f_impl.cc +++ b/gr-trellis/lib/siso_combined_f_impl.cc @@ -33,8 +33,6 @@ namespace gr { namespace trellis { - static const float INF = 1.0e9; - siso_combined_f::sptr siso_combined_f::make(const fsm &FSM, int K, int S0, int SK, diff --git a/gr-trellis/lib/siso_f_impl.cc b/gr-trellis/lib/siso_f_impl.cc index 2af5a21710..9428514cf7 100644 --- a/gr-trellis/lib/siso_f_impl.cc +++ b/gr-trellis/lib/siso_f_impl.cc @@ -33,8 +33,6 @@ namespace gr { namespace trellis { - static const float INF = 1.0e9; - siso_f::sptr siso_f::make(const fsm &FSM, int K, int S0, int SK, diff --git a/gr-trellis/lib/viterbi_X_impl.cc.t b/gr-trellis/lib/viterbi_X_impl.cc.t index 1d4864596e..d5949f0321 100644 --- a/gr-trellis/lib/viterbi_X_impl.cc.t +++ b/gr-trellis/lib/viterbi_X_impl.cc.t @@ -33,8 +33,6 @@ namespace gr { namespace trellis { - static const float INF = 1.0e9; - @BASE_NAME@::sptr @BASE_NAME@::make(const fsm &FSM, int K, int S0, int SK) diff --git a/gr-trellis/lib/viterbi_combined_XX_impl.cc.t b/gr-trellis/lib/viterbi_combined_XX_impl.cc.t index 722708bcd2..6d83dc4402 100644 --- a/gr-trellis/lib/viterbi_combined_XX_impl.cc.t +++ b/gr-trellis/lib/viterbi_combined_XX_impl.cc.t @@ -33,8 +33,6 @@ namespace gr { namespace trellis { - static const float INF = 1.0e9; - @BASE_NAME@::sptr @BASE_NAME@::make(const fsm &FSM, int K, int S0, int SK, int D, |