From 3f96c34aa5735b72a8c2a48d24ad38b1d9898933 Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Tue, 8 Jan 2013 14:25:56 -0600 Subject: [PATCH] global: Do not assert >= 0 for unsigned values Unsigned values are always >= 0. These assertions are redundant, so remove them. $ grep assert -r ./ |grep ">=" |grep 0 shows the assert(something >= 0). Remove those which assert(unsigned >= 0). Signed-off-by: Alexandru Gagniuc --- pv/data/logicsnapshot.cpp | 5 +---- pv/view/ruler.cpp | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp index 03e6a54f..9b3eedd1 100644 --- a/pv/data/logicsnapshot.cpp +++ b/pv/data/logicsnapshot.cpp @@ -167,7 +167,7 @@ void LogicSnapshot::append_payload_to_mipmap() uint64_t LogicSnapshot::get_sample(uint64_t index) const { assert(_data); - assert(index >= 0 && index < _sample_count); + assert(index < _sample_count); return *(uint64_t*)((uint8_t*)_data + index * _unit_size); } @@ -182,7 +182,6 @@ void LogicSnapshot::get_subsampled_edges( bool last_sample; bool fast_forward; - assert(start >= 0); assert(end <= get_sample_count()); assert(start <= end); assert(min_length > 0); @@ -258,7 +257,6 @@ void LogicSnapshot::get_subsampled_edges( (level + 1) * MipMapScalePower; const uint64_t offset = index >> level_scale_power; - assert(offset >= 0); // Check if we reached the last block at this // level, or if there was a change in this block @@ -293,7 +291,6 @@ void LogicSnapshot::get_subsampled_edges( (level + 1) * MipMapScalePower; const uint64_t offset = index >> level_scale_power; - assert(offset >= 0); // Check if we reached the last block at this // level, or if there was a change in this block diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index c043aacf..a442901c 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -79,7 +79,6 @@ void Ruler::paintEvent(QPaintEvent *event) } while (tick_period < min_period && unit < countof(ScaleUnits)); const unsigned int prefix = (order - FirstSIPrefixPower) / 3; - assert(prefix >= 0); assert(prefix < countof(SIPrefixes)); const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower); -- 2.30.2