Changeset 14646

Timestamp:

Dec 31, 2015, 5:22:42 AM (6 years ago)

Author:

mikedld

Message:

Loosen bitfield assertions to account for unknown bit counts

File:

• trunk/libtransmission/bitfield.c (modified) (3 diffs)

trunk/libtransmission/bitfield.c

@@ -255 +255 @@
 tr_bitfieldSetTrueCount (tr_bitfield * b, size_t n)
 {
-  assert (n <= b->bit_count);
+  assert (b->bit_count == 0 || n <= b->bit_count);
 
   b->true_count = n;
@@ -274 +274 @@
 tr_bitfieldIncTrueCount (tr_bitfield * b, size_t i)
 {
-  assert (i <= b->bit_count);
-  assert (b->true_count <= b->bit_count - i);
+  assert (b->bit_count == 0 || i <= b->bit_count);
+  assert (b->bit_count == 0 || b->true_count <= b->bit_count - i);
 
   tr_bitfieldSetTrueCount (b, b->true_count + i);
@@ -283 +283 @@
 tr_bitfieldDecTrueCount (tr_bitfield * b, size_t i)
 {
-  assert (i <= b->bit_count);
-  assert (b->true_count >= i);
+  assert (b->bit_count == 0 || i <= b->bit_count);
+  assert (b->bit_count == 0 || b->true_count >= i);
 
   tr_bitfieldSetTrueCount (b, b->true_count - i);