removed ssize_t, which is not standard C, and we're a C++ project

Co-authored-by: Josh Morman <jmorman@perspectalabs.com>
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>

4 files changed, 18 insertions, 14 deletions

diff --git a/gr-blocks/lib/file_descriptor_sink_impl.cc b/gr-blocks/lib/file_descriptor_sink_impl.cc
index 33d2da66a..d16d6d806 100644
--- a/gr-blocks/lib/file_descriptor_sink_impl.cc
+++ b/gr-blocks/lib/file_descriptor_sink_impl.cc
@@ -18,6 +18,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <cerrno>
+#include <cstddef>
 #include <cstdio>
 #include <stdexcept>
 
@@ -52,9 +53,7 @@ int file_descriptor_sink_impl::work(int noutput_items,
     unsigned long byte_size = noutput_items * d_itemsize;
 
     while (byte_size > 0) {
-        ssize_t r;
-
-        r = write(d_fd, inbuf, byte_size);
+        auto r = write(d_fd, inbuf, byte_size);
         if (r == -1) {
             if (errno == EINTR)
                 continue;
diff --git a/gr-blocks/lib/udp_sink_impl.cc b/gr-blocks/lib/udp_sink_impl.cc
index fae835c89..4391461da 100644
--- a/gr-blocks/lib/udp_sink_impl.cc
+++ b/gr-blocks/lib/udp_sink_impl.cc
@@ -18,7 +18,7 @@
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/format.hpp>
-#include <cstdio>
+#include <cstddef>
 #include <cstring>
 #include <memory>
 #include <stdexcept>
@@ -101,13 +101,15 @@ int udp_sink_impl::work(int noutput_items,
                         gr_vector_void_star& output_items)
 {
     const char* in = (const char*)input_items[0];
-    ssize_t r = 0, bytes_sent = 0, bytes_to_send = 0;
-    ssize_t total_size = noutput_items * d_itemsize;
+    size_t r = 0;
+    std::ptrdiff_t bytes_sent = 0, bytes_to_send = 0;
+    const size_t total_size = noutput_items * d_itemsize;
 
     gr::thread::scoped_lock guard(d_mutex); // protect d_socket
 
-    while (bytes_sent < total_size) {
-        bytes_to_send = std::min((ssize_t)d_payload_size, (total_size - bytes_sent));
+    while (bytes_sent < static_cast<std::ptrdiff_t>(total_size)) {
+        bytes_to_send = std::min(static_cast<std::ptrdiff_t>(d_payload_size),
+                                 static_cast<std::ptrdiff_t>(total_size - bytes_sent));
 
         if (d_connected) {
             try {
diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc
index 4b8815372..11765de50 100644
--- a/gr-blocks/lib/udp_source_impl.cc
+++ b/gr-blocks/lib/udp_source_impl.cc
@@ -16,6 +16,7 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
 #include <gnuradio/prefs.h>
+#include <cstddef>
 #include <cstring>
 #include <memory>
 
@@ -176,12 +177,12 @@ int udp_source_impl::work(int noutput_items,
         return d_residual;
     }
 
-    int bytes_left_in_buffer = (int)(d_residual - d_sent);
-    int bytes_to_send = std::min<int>(d_itemsize * noutput_items, bytes_left_in_buffer);
+    const std::ptrdiff_t bytes_left_in_buffer = d_residual - d_sent;
+    auto bytes_to_send =
+        std::min<std::ptrdiff_t>(d_itemsize * noutput_items, bytes_left_in_buffer);
 
     // Copy the received data in the residual buffer to the output stream
     memcpy(out, d_residbuf.data() + d_sent, bytes_to_send);
-    int nitems = bytes_to_send / d_itemsize;
 
     // Keep track of where we are if we don't have enough output
     // space to send all the data in the residbuf.
@@ -192,7 +193,7 @@ int udp_source_impl::work(int noutput_items,
         d_sent += bytes_to_send;
     }
 
-    return nitems;
+    return bytes_to_send / d_itemsize;
 }
 
 } /* namespace blocks */
diff --git a/gr-blocks/lib/udp_source_impl.h b/gr-blocks/lib/udp_source_impl.h
index 608b44504..a2dc2dc9d 100644
--- a/gr-blocks/lib/udp_source_impl.h
+++ b/gr-blocks/lib/udp_source_impl.h
@@ -15,6 +15,7 @@
 #include <gnuradio/thread/thread.h>
 #include <boost/asio.hpp>
 #include <boost/format.hpp>
+#include <cstddef>
 #include <memory>
 
 namespace gr {
@@ -29,8 +30,9 @@ private:
     bool d_connected;             // are we connected?
     std::vector<char> d_rxbuf;    // get UDP buffer items
     std::vector<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
+    std::ptrdiff_t
+        d_residual; // hold information about number of bytes stored in residbuf
+    size_t d_sent;  // track how much of d_residbuf we've outputted
 
     static const int
         BUF_SIZE_PAYLOADS; //!< The d_residbuf size in multiples of d_payload_size