Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / data / segment.cpp

diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index 64d9cd66081a414aa1dc5460e64ec4cdc94d868e..88015c3639860597accf8bf23eb21ed98d499e53 100644 (file)
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -20,15 +20,13 @@
 
 #include "segment.hpp"
 
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <vector>
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
 
 using std::lock_guard;
+using std::min;
 using std::recursive_mutex;
-using std::vector;
 
 namespace pv {
 namespace data {
@@ -48,8 +46,7 @@ Segment::Segment(uint64_t samplerate, unsigned int unit_size) :
 
        // Determine the number of samples we can fit in one chunk
        // without exceeding MaxChunkSize
-       chunk_size_ = std::min(MaxChunkSize,
-               (MaxChunkSize / unit_size_) * unit_size_);
+       chunk_size_ = min(MaxChunkSize, (MaxChunkSize / unit_size_) * unit_size_);
 
        // Create the initial chunk
        current_chunk_ = new uint8_t[chunk_size_];
@@ -120,8 +117,7 @@ void Segment::append_single_sample(void *data)
        // There will always be space for at least one sample in
        // the current chunk, so we do not need to test for space
 
-       memcpy(current_chunk_ + (used_samples_ * unit_size_),
-               data, unit_size_);
+       memcpy(current_chunk_ + (used_samples_ * unit_size_), data, unit_size_);
        used_samples_++;
        unused_samples_--;
 
@@ -189,7 +185,7 @@ uint8_t* Segment::get_raw_samples(uint64_t start, uint64_t count) const
        while (count > 0) {
                const uint8_t* chunk = data_chunks_[chunk_num];
 
-               uint64_t copy_size = std::min(count * unit_size_,
+               uint64_t copy_size = min(count * unit_size_,
                        chunk_size_ - chunk_offs);
 
                memcpy(dest_ptr, chunk + chunk_offs, copy_size);
@@ -225,14 +221,12 @@ void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t
 {
        lock_guard<recursive_mutex> lock(mutex_);
 
+       // Fail gracefully if we are asked to deliver data we don't have
        if (it->sample_index > sample_count_)
-       {
-               // Fail gracefully if we are asked to deliver data we don't have
                return;
-       } else {
-               it->sample_index += increase;
-               it->chunk_offs += (increase * unit_size_);
-       }
+
+       it->sample_index += increase;
+       it->chunk_offs += (increase * unit_size_);
 
        if (it->chunk_offs > (chunk_size_ - 1)) {
                it->chunk_num++;
@@ -255,6 +249,5 @@ void Segment::end_raw_sample_iteration(SegmentRawDataIterator* it)
        }
 }
 
-
 } // namespace data
 } // namespace pv