summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2013-11-15 15:01:40 -0500
committerJohnathan Corgan <johnathan@corganlabs.com>2013-11-16 10:29:30 -0800
commit7cac6427cd89339fac44ce94032a70ad3aeb0025 (patch)
treec94e9498c8e0cb57378b1b2717e10d682cf9844a
parent514c46422822e21be41d545dc8aecfc7a8c7b726 (diff)
fir_filter.cc, fir_filter_with_buffer.cc : Address Coverity sizeof not portable warnings.
Addresses CID 1043317, 1043318, 1043319, and 1043320. Signed-off-by: Philip Balister <philip@balister.org>
-rw-r--r--gr-filter/lib/fir_filter.cc2
-rw-r--r--gr-filter/lib/fir_filter_with_buffer.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc
index 50769b3430..552936b8f6 100644
--- a/gr-filter/lib/fir_filter.cc
+++ b/gr-filter/lib/fir_filter.cc
@@ -535,7 +535,7 @@ namespace gr {
std::reverse(d_taps.begin(), d_taps.end());
// Make a set of taps at all possible arch alignments
- d_aligned_taps = (gr_complex**)malloc(d_naligned*sizeof(gr_complex**));
+ d_aligned_taps = (gr_complex**)malloc(d_naligned*sizeof(gr_complex*));
for(int i = 0; i < d_naligned; i++) {
d_aligned_taps[i] = fft::malloc_complex(d_ntaps+d_naligned-1);
memset(d_aligned_taps[i], 0, sizeof(gr_complex)*(d_ntaps+d_naligned-1));
diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc
index b6984e4f1f..9953d48dd5 100644
--- a/gr-filter/lib/fir_filter_with_buffer.cc
+++ b/gr-filter/lib/fir_filter_with_buffer.cc
@@ -100,7 +100,7 @@ namespace gr {
d_buffer = d_buffer_ptr + d_naligned;
// Allocate aligned taps
- d_aligned_taps = (float**)malloc(d_naligned*sizeof(float**));
+ d_aligned_taps = (float**)malloc(d_naligned*sizeof(float*));
for(int i = 0; i < d_naligned; i++) {
d_aligned_taps[i] = fft::malloc_float(d_ntaps+d_naligned-1);
memset(d_aligned_taps[i], 0, sizeof(float)*(d_ntaps+d_naligned-1));
@@ -253,7 +253,7 @@ namespace gr {
d_buffer = d_buffer_ptr + d_naligned;
// Allocate aligned taps
- d_aligned_taps = (gr_complex**)malloc(d_naligned*sizeof(gr_complex**));
+ d_aligned_taps = (gr_complex**)malloc(d_naligned*sizeof(gr_complex*));
for(int i = 0; i < d_naligned; i++) {
d_aligned_taps[i] = fft::malloc_complex(d_ntaps+d_naligned-1);
memset(d_aligned_taps[i], 0, sizeof(gr_complex)*(d_ntaps+d_naligned-1));
@@ -406,7 +406,7 @@ namespace gr {
d_buffer = d_buffer_ptr + d_naligned;
// Allocate aligned taps
- d_aligned_taps = (float**)malloc(d_naligned*sizeof(float**));
+ d_aligned_taps = (float**)malloc(d_naligned*sizeof(float*));
for(int i = 0; i < d_naligned; i++) {
d_aligned_taps[i] = fft::malloc_float(d_ntaps+d_naligned-1);
memset(d_aligned_taps[i], 0, sizeof(float)*(d_ntaps+d_naligned-1));