Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14b01fb4 authored by Myles Watson's avatar Myles Watson
Browse files

Packet: Simplify range logic for tidy-ness 

Bug: 266221125
Test: atest bluetooth_test_gd_unit
Change-Id: I2dc1c454a3ef38d914dd824e6a487394ebcc1a9a
parent db46fbcd

system/gd/packet/iterator.cc

+7 −2
Original line number Diff line number Diff line
@@ -122,7 +122,12 @@ bool Iterator<little_endian>::operator>=(const Iterator<little_endian>& itr) con 


template <bool little_endian>

uint8_t Iterator<little_endian>::operator*() const {

  ASSERT_LOG(index_ < end_ && !(begin_ > index_), "Index %zu out of bounds: [%zu,%zu)", index_, begin_, end_);

  ASSERT_LOG(

      NumBytesRemaining() > 0,

      "Index %zu out of bounds: [%zu,%zu)",

      index_,

      begin_,

      end_);

  size_t index = index_;



  for (auto view : data_) {
@@ -137,7 +142,7 @@ uint8_t Iterator<little_endian>::operator*() const { 


template <bool little_endian>

size_t Iterator<little_endian>::NumBytesRemaining() const {

  if (end_ > index_ && !(begin_ > index_)) {

  if (end_ > index_ && index_ >= begin_) {

    return end_ - index_;

  }

  return 0;