From b356fabe120da4c45636d42c86111cf31ae470e4 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 20 Jan 2024 15:44:27 -0800 Subject: [PATCH] clang-tidy: avoid else after return Found with: readability-else-after-return Signed-off-by: Rosen Penev --- taglib/mp4/mp4atom.cpp | 20 ++++++------ taglib/mp4/mp4itemfactory.cpp | 58 +++++++++++++++++------------------ 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp index c8ca88c1..0a1eb587 100644 --- a/taglib/mp4/mp4atom.cpp +++ b/taglib/mp4/mp4atom.cpp @@ -279,17 +279,17 @@ bool MP4::Atoms::checkRootLevelAtoms() { moovValid = true; } if(invalid) { - if(moovValid && (*it)->name() != "moof") { - // Only the root level atoms "moov" and (if present) "moof" are - // modified. If they are valid, ignore following invalid root level - // atoms as trailing garbage. - while(it != d->atoms.end()) { - delete *it; - it = d->atoms.erase(it); - } - return true; + if(!moovValid || (*it)->name() == "moof") + return false; + + // Only the root level atoms "moov" and (if present) "moof" are + // modified. If they are valid, ignore following invalid root level + // atoms as trailing garbage. + while(it != d->atoms.end()) { + delete *it; + it = d->atoms.erase(it); } - return false; + return true; } } diff --git a/taglib/mp4/mp4itemfactory.cpp b/taglib/mp4/mp4itemfactory.cpp index 667fd558..b940a32c 100644 --- a/taglib/mp4/mp4itemfactory.cpp +++ b/taglib/mp4/mp4itemfactory.cpp @@ -97,35 +97,35 @@ ByteVector ItemFactory::renderItem( } const ByteVector name = itemName.data(String::Latin1); switch(handlerTypeForName(name)) { - case ItemHandlerType::Unknown: - debug("MP4: Unknown item name \"" + name + "\""); - break; - case ItemHandlerType::FreeForm: - return renderFreeForm(name, item); - case ItemHandlerType::IntPair: - return renderIntPair(name, item); - case ItemHandlerType::IntPairNoTrailing: - return renderIntPairNoTrailing(name, item); - case ItemHandlerType::Bool: - return renderBool(name, item); - case ItemHandlerType::Int: - return renderInt(name, item); - case ItemHandlerType::TextOrInt: - return renderTextOrInt(name, item); - case ItemHandlerType::UInt: - return renderUInt(name, item); - case ItemHandlerType::LongLong: - return renderLongLong(name, item); - case ItemHandlerType::Byte: - return renderByte(name, item); - case ItemHandlerType::Gnre: - return renderInt(name, item); - case ItemHandlerType::Covr: - return renderCovr(name, item); - case ItemHandlerType::TextImplicit: - return renderText(name, item, TypeImplicit); - case ItemHandlerType::Text: - return renderText(name, item); + case ItemHandlerType::Unknown: + debug("MP4: Unknown item name \"" + name + "\""); + break; + case ItemHandlerType::FreeForm: + return renderFreeForm(name, item); + case ItemHandlerType::IntPair: + return renderIntPair(name, item); + case ItemHandlerType::IntPairNoTrailing: + return renderIntPairNoTrailing(name, item); + case ItemHandlerType::Bool: + return renderBool(name, item); + case ItemHandlerType::Int: + return renderInt(name, item); + case ItemHandlerType::TextOrInt: + return renderTextOrInt(name, item); + case ItemHandlerType::UInt: + return renderUInt(name, item); + case ItemHandlerType::LongLong: + return renderLongLong(name, item); + case ItemHandlerType::Byte: + return renderByte(name, item); + case ItemHandlerType::Gnre: + return renderInt(name, item); + case ItemHandlerType::Covr: + return renderCovr(name, item); + case ItemHandlerType::TextImplicit: + return renderText(name, item, TypeImplicit); + case ItemHandlerType::Text: + return renderText(name, item); } return ByteVector(); }