X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsegment.cpp;fp=pv%2Fdata%2Fsegment.cpp;h=88015c3639860597accf8bf23eb21ed98d499e53;hp=ceaf0a056ef84a2c8f473f1d664559b4e583ce1e;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=db1aabc15dc8680673b943c2dd0f38a83c32a1d9 diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp index ceaf0a05..88015c36 100644 --- a/pv/data/segment.cpp +++ b/pv/data/segment.cpp @@ -117,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_--; @@ -222,14 +221,12 @@ void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t { lock_guard 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++; @@ -252,6 +249,5 @@ void Segment::end_raw_sample_iteration(SegmentRawDataIterator* it) } } - } // namespace data } // namespace pv