From f1957476b8b83438a994542b82b10117d63b3587 Mon Sep 17 00:00:00 2001
From: Victor Castillo <victorcastilloaguero@gmail.com>
Date: Mon, 19 Aug 2024 15:37:58 +0200
Subject: [PATCH] Use std::ifstream instead of FILE for reading sample data

---
 src/algorithms/signal_source/libs/ion_gsms.cc | 14 ++++----------
 src/algorithms/signal_source/libs/ion_gsms.h  |  7 +++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/algorithms/signal_source/libs/ion_gsms.cc b/src/algorithms/signal_source/libs/ion_gsms.cc
index 78f9060bd..ca46c7c53 100644
--- a/src/algorithms/signal_source/libs/ion_gsms.cc
+++ b/src/algorithms/signal_source/libs/ion_gsms.cc
@@ -30,14 +30,14 @@ IONGSMSFileSource::IONGSMSFileSource(
           "ion_gsms_file_source",
           gr::io_signature::make(0, 0, 0),
           make_output_signature(block, stream_ids)),
+      file_stream_(metadata_filepath.parent_path() / file.Url().Value()),
       io_buffer_offset_(0),
       maximum_item_rate_(0),
       chunk_cycle_length_(0)
 {
     fs::path data_filepath = metadata_filepath.parent_path() / file.Url().Value();
-    fd_ = std::fopen(data_filepath.c_str(), "rb");
     std::size_t block_offset = file.Offset();
-    std::fseek(fd_, file.Offset() + block_offset + block.SizeHeader(), SEEK_SET);
+    file_stream_.seekg(file.Offset() + block_offset + block.SizeHeader());
 
     std::size_t output_stream_offset = 0;
     for (const auto& chunk : block.Chunks())
@@ -56,12 +56,6 @@ IONGSMSFileSource::IONGSMSFileSource(
 }
 
 
-IONGSMSFileSource::~IONGSMSFileSource()
-{
-    std::fclose(fd_);
-}
-
-
 int IONGSMSFileSource::work(
     int noutput_items,
     gr_vector_const_void_star& input_items __attribute__((unused)),
@@ -70,7 +64,7 @@ int IONGSMSFileSource::work(
     const std::size_t max_sample_output = std::floor((noutput_items - 1.0) / maximum_item_rate_);
     io_buffer_.resize(max_sample_output * chunk_cycle_length_);
     io_buffer_offset_ = 0;
-    std::fread(io_buffer_.data(), sizeof(decltype(io_buffer_)::value_type), io_buffer_.size(), fd_);
+    file_stream_.read(io_buffer_.data(), sizeof(decltype(io_buffer_)::value_type) * io_buffer_.size());
 
     items_produced_.resize(output_items.size());
     for (int& i : items_produced_)
@@ -83,7 +77,7 @@ int IONGSMSFileSource::work(
             for (auto& c : chunk_data_)
                 {
                     auto* chunk = c.get();
-                    io_buffer_offset_ += chunk->read_from_buffer(io_buffer_.data(), io_buffer_offset_);
+                    io_buffer_offset_ += chunk->read_from_buffer(reinterpret_cast<uint8_t*>(io_buffer_.data()), io_buffer_offset_);
                     chunk->write_to_output(output_items, items_produced_);
                 }
         }
diff --git a/src/algorithms/signal_source/libs/ion_gsms.h b/src/algorithms/signal_source/libs/ion_gsms.h
index 64a3e8c16..c9bc8efd2 100644
--- a/src/algorithms/signal_source/libs/ion_gsms.h
+++ b/src/algorithms/signal_source/libs/ion_gsms.h
@@ -27,6 +27,7 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include <fstream>
 
 /** \addtogroup Signal_Source
  * \{ */
@@ -44,8 +45,6 @@ public:
         const GnssMetadata::Block& block,
         const std::vector<std::string>& stream_ids);
 
-    ~IONGSMSFileSource() override;
-
     int work(
         int noutput_items,
         gr_vector_const_void_star& input_items,
@@ -57,8 +56,8 @@ public:
 private:
     static gr::io_signature::sptr make_output_signature(const GnssMetadata::Block& block, const std::vector<std::string>& stream_ids);
 
-    FILE* fd_;
-    std::vector<uint8_t> io_buffer_;
+    std::ifstream file_stream_;
+    std::vector<char> io_buffer_;
     std::size_t io_buffer_offset_;
     std::vector<int> items_produced_;
     std::size_t output_stream_count_;