[pan] Removed an unused parameter from PartsBatch init, added constructors.



commit d8f60ebb523e8dc89abaf0dfbc2e73de239ad427
Author: Thomas Tanner <thosrtanner googlemail com>
Date:   Sat Sep 24 09:24:32 2022 +0100

    Removed an unused parameter from PartsBatch init, added constructors.

 pan/data-impl/headers.cc |  2 +-
 pan/data/parts.cc        | 34 +++++++++++++++++++++++++---------
 pan/data/parts.h         |  6 +++++-
 3 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc
index 0a63dc6..febdee1 100644
--- a/pan/data-impl/headers.cc
+++ b/pan/data-impl/headers.cc
@@ -559,7 +559,7 @@ DataImpl :: load_headers (const DataIO   & data_io,
         s.ltrim(); if (s.pop_token (tok)) a.lines = atoi (tok.str); // this field was added in 0.115
 
         // found parts...
-        part_batch.init (a.message_id, total_part_count, found_part_count);
+        part_batch.init (a.message_id, total_part_count);
 //        std::cerr<<"article "<<a.message_id<<" "<<total_part_count<<" "<<found_part_count<<std::endl;
         for (int i(0), count(found_part_count); i<count; ++i)
         {
diff --git a/pan/data/parts.cc b/pan/data/parts.cc
index 3adf720..d7711ff 100644
--- a/pan/data/parts.cc
+++ b/pan/data/parts.cc
@@ -20,10 +20,11 @@
 #include "parts.h"
 
 #include <config.h>
+#ifdef DEBUG
 #include <cassert>
+#include <string>
+#endif
 #include <algorithm>
-#include <pan/general/debug.h>
-#include <pan/general/macros.h>
 #include <pan/general/string-view.h>
 
 #undef DEBUG
@@ -281,15 +282,30 @@ Parts :: add_part (number_t            num,
 *****
 ****/
 
+PartBatch::PartBatch() :
+  n_parts_found(0),
+  n_parts_total(0),
+  packed_mids_len(0)
+{
+}
+
+PartBatch::PartBatch(Quark const &mid, number_t parts_total) :
+  reference_mid(mid),
+  n_parts_found(0),
+  n_parts_total(parts_total),
+  packed_mids_len(0)
+{
+  parts.reserve(n_parts_total);
+}
+
 void
 PartBatch :: init (const Quark  & mid,
-                   number_t       n_parts_total,
-                   number_t       n_parts_found UNUSED )
+                   number_t       parts_total)
 {
-  this->reference_mid = mid;
-  this->packed_mids_len = 0;
-  this->n_parts_total = n_parts_total;
-  this->n_parts_found = 0; // they haven't been added yet
+  reference_mid = mid;
+  packed_mids_len = 0;
+  n_parts_total = parts_total;
+  n_parts_found = 0; // they haven't been added yet
 
   parts.clear();
   parts.reserve(n_parts_total);
@@ -352,7 +368,7 @@ PartBatch :: Part :: Part (number_t n, bytes_t b, size_t l):
 }
 
 void
-PartBatch :: sort (void)
+PartBatch :: sort ()
 {
   std::sort (parts.begin (), parts.end ());
 }
diff --git a/pan/data/parts.h b/pan/data/parts.h
index 14d9c47..289c57e 100644
--- a/pan/data/parts.h
+++ b/pan/data/parts.h
@@ -158,7 +158,11 @@ namespace pan
       size_t packed_mids_len;
 
     public:
-      void init (const Quark& mid, number_t n_parts=0, number_t n_found=0);
+
+      PartBatch();
+      explicit PartBatch(Quark const &mid, number_t n_parts = 0);
+
+      void init (const Quark& mid, number_t n_parts=0);
       void add_part (number_t num, const StringView& mid, bytes_t bytes);
       void sort ();
   };


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]