From 48c4bf9c05dbbb264698c071418f4258446f7854 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 16 Sep 2023 04:28:12 -0700 Subject: [PATCH] change two loops to while (#1147) and one to for range. Signed-off-by: Rosen Penev --- taglib/ogg/oggfile.cpp | 4 ++-- taglib/riff/rifffile.cpp | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/taglib/ogg/oggfile.cpp b/taglib/ogg/oggfile.cpp index 73019513..b91ff28f 100644 --- a/taglib/ogg/oggfile.cpp +++ b/taglib/ogg/oggfile.cpp @@ -269,8 +269,8 @@ void Ogg::File::writePacket(unsigned int i, const ByteVector &packet) // Write the pages. ByteVector data; - for(it = pages.begin(); it != pages.end(); ++it) - data.append((*it)->render()); + for(const auto &page : pages) + data.append(page->render()); const offset_t originalOffset = firstPage->fileOffset(); const offset_t originalLength = lastPage->fileOffset() + lastPage->size() - originalOffset; diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp index f24a1ec6..702fce1a 100644 --- a/taglib/riff/rifffile.cpp +++ b/taglib/riff/rifffile.cpp @@ -167,8 +167,11 @@ void RIFF::File::setChunkData(unsigned int i, const ByteVector &data) // Now update the internal offsets - for(++it; it != d->chunks.end(); ++it) + it = std::next(it); + while(it != d->chunks.end()) { it->offset += static_cast(diff); + ++it; + } // Update the global size. @@ -254,8 +257,10 @@ void RIFF::File::removeChunk(unsigned int i) removeBlock(it->offset - 8, removeSize); it = d->chunks.erase(it); - for(; it != d->chunks.end(); ++it) + while(it != d->chunks.end()) { it->offset -= removeSize; + ++it; + } // Update the global size.