summaryrefslogtreecommitdiff
path: root/gr-blocks
diff options
context:
space:
mode:
authorThomas Habets <thomas@habets.se>2019-12-21 18:34:25 +0000
committerMartin Braun <martin.braun@ettus.com>2020-01-06 15:38:02 -0800
commit88879ff7a19c729df136fc9a5995616cb3ac828a (patch)
tree2eadf42023c421fa0ba3ee7ab4ea9f90f4c70ef6 /gr-blocks
parent37de27c9591b9a7fd580bde5866ca4ed44e7a9ec (diff)
gr-blocks: More const
Diffstat (limited to 'gr-blocks')
-rw-r--r--gr-blocks/lib/file_descriptor_sink_impl.cc2
-rw-r--r--gr-blocks/lib/file_descriptor_sink_impl.h4
-rw-r--r--gr-blocks/lib/file_descriptor_source_impl.cc2
-rw-r--r--gr-blocks/lib/file_descriptor_source_impl.h6
-rw-r--r--gr-blocks/lib/file_meta_sink_impl.h6
-rw-r--r--gr-blocks/lib/file_meta_source_impl.h2
-rw-r--r--gr-blocks/lib/file_sink_impl.cc4
-rw-r--r--gr-blocks/lib/file_sink_impl.h2
-rw-r--r--gr-blocks/lib/file_source_impl.h2
-rw-r--r--gr-blocks/lib/tagged_stream_multiply_length_impl.h4
10 files changed, 17 insertions, 17 deletions
diff --git a/gr-blocks/lib/file_descriptor_sink_impl.cc b/gr-blocks/lib/file_descriptor_sink_impl.cc
index 1d24bd441d..d76fd83e1b 100644
--- a/gr-blocks/lib/file_descriptor_sink_impl.cc
+++ b/gr-blocks/lib/file_descriptor_sink_impl.cc
@@ -61,7 +61,7 @@ int file_descriptor_sink_impl::work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items)
{
- char* inbuf = (char*)input_items[0];
+ const char* inbuf = static_cast<const char*>(input_items[0]);
unsigned long byte_size = noutput_items * d_itemsize;
while (byte_size > 0) {
diff --git a/gr-blocks/lib/file_descriptor_sink_impl.h b/gr-blocks/lib/file_descriptor_sink_impl.h
index 16df63333e..e71d1b4722 100644
--- a/gr-blocks/lib/file_descriptor_sink_impl.h
+++ b/gr-blocks/lib/file_descriptor_sink_impl.h
@@ -31,8 +31,8 @@ namespace blocks {
class file_descriptor_sink_impl : public file_descriptor_sink
{
private:
- size_t d_itemsize;
- int d_fd;
+ const size_t d_itemsize;
+ const int d_fd;
public:
file_descriptor_sink_impl(size_t itemsize, int fd);
diff --git a/gr-blocks/lib/file_descriptor_source_impl.cc b/gr-blocks/lib/file_descriptor_source_impl.cc
index 276510056a..b2dd5e36af 100644
--- a/gr-blocks/lib/file_descriptor_source_impl.cc
+++ b/gr-blocks/lib/file_descriptor_source_impl.cc
@@ -98,7 +98,7 @@ int file_descriptor_source_impl::read_items(char* buf, int nitems)
int file_descriptor_source_impl::handle_residue(char* buf, int nbytes_read)
{
assert(nbytes_read >= 0);
- int nitems_read = nbytes_read / d_itemsize;
+ const int nitems_read = nbytes_read / d_itemsize;
d_residue_len = nbytes_read % d_itemsize;
if (d_residue_len > 0) {
// fprintf (stderr, "handle_residue: %d\n", d_residue_len);
diff --git a/gr-blocks/lib/file_descriptor_source_impl.h b/gr-blocks/lib/file_descriptor_source_impl.h
index b058fe1918..537dd84e42 100644
--- a/gr-blocks/lib/file_descriptor_source_impl.h
+++ b/gr-blocks/lib/file_descriptor_source_impl.h
@@ -31,9 +31,9 @@ namespace blocks {
class file_descriptor_source_impl : public file_descriptor_source
{
private:
- size_t d_itemsize;
- int d_fd;
- bool d_repeat;
+ const size_t d_itemsize;
+ const int d_fd;
+ const bool d_repeat;
std::vector<unsigned char> d_residue;
unsigned long d_residue_len;
diff --git a/gr-blocks/lib/file_meta_sink_impl.h b/gr-blocks/lib/file_meta_sink_impl.h
index 80ce1f8306..5ff634fbbf 100644
--- a/gr-blocks/lib/file_meta_sink_impl.h
+++ b/gr-blocks/lib/file_meta_sink_impl.h
@@ -36,10 +36,10 @@ class file_meta_sink_impl : public file_meta_sink
private:
enum meta_state_t { STATE_INLINE = 0, STATE_DETACHED };
- size_t d_itemsize;
+ const size_t d_itemsize;
double d_samp_rate;
- double d_relative_rate;
- size_t d_max_seg_size;
+ const double d_relative_rate;
+ const size_t d_max_seg_size;
size_t d_total_seg_size;
pmt_t d_header;
pmt_t d_extra;
diff --git a/gr-blocks/lib/file_meta_source_impl.h b/gr-blocks/lib/file_meta_source_impl.h
index fd0fbc58e3..27eb434708 100644
--- a/gr-blocks/lib/file_meta_source_impl.h
+++ b/gr-blocks/lib/file_meta_source_impl.h
@@ -45,7 +45,7 @@ private:
pmt_t d_time_stamp;
size_t d_seg_size;
bool d_updated;
- bool d_repeat;
+ const bool d_repeat;
FILE *d_new_fp, *d_new_hdr_fp;
FILE *d_fp, *d_hdr_fp;
diff --git a/gr-blocks/lib/file_sink_impl.cc b/gr-blocks/lib/file_sink_impl.cc
index 0f49138359..35df867429 100644
--- a/gr-blocks/lib/file_sink_impl.cc
+++ b/gr-blocks/lib/file_sink_impl.cc
@@ -50,7 +50,7 @@ int file_sink_impl::work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items)
{
- char* inbuf = (char*)input_items[0];
+ const char* inbuf = static_cast<const char*>(input_items[0]);
int nwritten = 0;
do_update(); // update d_fp is reqd
@@ -59,7 +59,7 @@ int file_sink_impl::work(int noutput_items,
return noutput_items; // drop output on the floor
while (nwritten < noutput_items) {
- int count = fwrite(inbuf, d_itemsize, noutput_items - nwritten, d_fp);
+ const int count = fwrite(inbuf, d_itemsize, noutput_items - nwritten, d_fp);
if (count == 0) {
if (ferror(d_fp)) {
std::stringstream s;
diff --git a/gr-blocks/lib/file_sink_impl.h b/gr-blocks/lib/file_sink_impl.h
index 3671aab540..4b6685ab0c 100644
--- a/gr-blocks/lib/file_sink_impl.h
+++ b/gr-blocks/lib/file_sink_impl.h
@@ -31,7 +31,7 @@ namespace blocks {
class file_sink_impl : public file_sink
{
private:
- size_t d_itemsize;
+ const size_t d_itemsize;
public:
file_sink_impl(size_t itemsize, const char* filename, bool append = false);
diff --git a/gr-blocks/lib/file_source_impl.h b/gr-blocks/lib/file_source_impl.h
index bec21ea8ab..a39190de8f 100644
--- a/gr-blocks/lib/file_source_impl.h
+++ b/gr-blocks/lib/file_source_impl.h
@@ -32,7 +32,7 @@ namespace blocks {
class BLOCKS_API file_source_impl : public file_source
{
private:
- size_t d_itemsize;
+ const size_t d_itemsize;
uint64_t d_start_offset_items;
uint64_t d_length_items;
uint64_t d_items_remaining;
diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.h b/gr-blocks/lib/tagged_stream_multiply_length_impl.h
index 3a8680b1e9..534b6b7219 100644
--- a/gr-blocks/lib/tagged_stream_multiply_length_impl.h
+++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.h
@@ -32,9 +32,9 @@ namespace blocks {
class tagged_stream_multiply_length_impl : public tagged_stream_multiply_length
{
private:
- pmt::pmt_t d_lengthtag;
+ const pmt::pmt_t d_lengthtag;
double d_scalar;
- size_t d_itemsize;
+ const size_t d_itemsize;
public:
tagged_stream_multiply_length_impl(size_t itemsize,
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-23 14:21:36 +0000