From a8884c2b17f5615bfc4260698a1f6d5fe51a6bb0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 16 Jun 2021 18:50:15 -0700 Subject: [PATCH] clang-tidy: don't use else after return Found with readability-else-after-return Signed-off-by: Rosen Penev --- taglib/ape/apefooter.cpp | 6 +-- taglib/ape/apeitem.cpp | 3 +- taglib/asf/asftag.cpp | 3 +- taglib/audioproperties.cpp | 27 +++++++------- taglib/fileref.cpp | 6 +-- taglib/mp4/mp4tag.cpp | 2 +- taglib/mpeg/id3v1/id3v1genres.cpp | 3 +- taglib/mpeg/id3v1/id3v1tag.cpp | 3 +- .../id3v2/frames/tableofcontentsframe.cpp | 2 +- taglib/mpeg/id3v2/id3v2frame.cpp | 33 +++++++---------- taglib/mpeg/id3v2/id3v2framefactory.cpp | 8 ++-- taglib/mpeg/id3v2/id3v2header.cpp | 3 +- taglib/ogg/oggfile.cpp | 3 +- taglib/riff/wav/infotag.cpp | 6 +-- taglib/tagunion.cpp | 8 ++-- taglib/toolkit/tbytevector.cpp | 18 +++------ taglib/toolkit/tfile.cpp | 37 +++++++++---------- taglib/toolkit/tfilestream.cpp | 2 +- taglib/toolkit/tstring.cpp | 12 ++---- 19 files changed, 77 insertions(+), 108 deletions(-) diff --git a/taglib/ape/apefooter.cpp b/taglib/ape/apefooter.cpp index c5c99a5a..e9aefee7 100644 --- a/taglib/ape/apefooter.cpp +++ b/taglib/ape/apefooter.cpp @@ -135,8 +135,7 @@ unsigned int APE::Footer::completeTagSize() const { if(d->headerPresent) return d->tagSize + size(); - else - return d->tagSize; + return d->tagSize; } void APE::Footer::setTagSize(unsigned int s) @@ -158,8 +157,7 @@ ByteVector APE::Footer::renderHeader() const { if(!d->headerPresent) return ByteVector(); - else - return render(true); + return render(true); } //////////////////////////////////////////////////////////////////////////////// diff --git a/taglib/ape/apeitem.cpp b/taglib/ape/apeitem.cpp index 9ba41946..bbf463ab 100644 --- a/taglib/ape/apeitem.cpp +++ b/taglib/ape/apeitem.cpp @@ -219,8 +219,7 @@ String APE::Item::toString() const { if(d->type == Text && !isEmpty()) return d->text.front(); - else - return String(); + return String(); } bool APE::Item::isEmpty() const diff --git a/taglib/asf/asftag.cpp b/taglib/asf/asftag.cpp index 84357e0c..75249121 100644 --- a/taglib/asf/asftag.cpp +++ b/taglib/asf/asftag.cpp @@ -94,8 +94,7 @@ unsigned int ASF::Tag::track() const const ASF::Attribute attr = d->attributeListMap["WM/TrackNumber"][0]; if(attr.type() == ASF::Attribute::DWordType) return attr.toUInt(); - else - return attr.toString().toInt(); + return attr.toString().toInt(); } if(d->attributeListMap.contains("WM/Track")) return d->attributeListMap["WM/Track"][0].toUInt(); diff --git a/taglib/audioproperties.cpp b/taglib/audioproperties.cpp index c29051a6..421785e9 100644 --- a/taglib/audioproperties.cpp +++ b/taglib/audioproperties.cpp @@ -49,32 +49,31 @@ using namespace TagLib; #define VIRTUAL_FUNCTION_WORKAROUND(function_name, default_value) \ if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else if(dynamic_cast(this)) \ + if(dynamic_cast(this)) \ return dynamic_cast(this)->function_name(); \ - else \ - return (default_value); + return (default_value); class AudioProperties::AudioPropertiesPrivate { diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp index 4ba5776b..f91209a0 100644 --- a/taglib/fileref.cpp +++ b/taglib/fileref.cpp @@ -152,8 +152,7 @@ namespace if(file) { if(file->isValid()) return file; - else - delete file; + delete file; } return 0; @@ -200,8 +199,7 @@ namespace if(file) { if(file->isValid()) return file; - else - delete file; + delete file; } return 0; diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp index 8e67ad16..ab106bf3 100644 --- a/taglib/mp4/mp4tag.cpp +++ b/taglib/mp4/mp4tag.cpp @@ -140,7 +140,7 @@ MP4::Tag::parseData2(const MP4::Atom *atom, int expectedFlags, bool freeForm) debug("MP4: Unexpected atom \"" + name + "\", expecting \"mean\""); return result; } - else if(i == 1 && name != "name") { + if(i == 1 && name != "name") { debug("MP4: Unexpected atom \"" + name + "\", expecting \"name\""); return result; } diff --git a/taglib/mpeg/id3v1/id3v1genres.cpp b/taglib/mpeg/id3v1/id3v1genres.cpp index 581eb573..c21f9897 100644 --- a/taglib/mpeg/id3v1/id3v1genres.cpp +++ b/taglib/mpeg/id3v1/id3v1genres.cpp @@ -250,8 +250,7 @@ String ID3v1::genre(int i) { if(i >= 0 && i < genresSize) return String(genres[i]); // always make a copy - else - return String(); + return String(); } int ID3v1::genreIndex(const String &name) diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp index 53110b14..358a9595 100644 --- a/taglib/mpeg/id3v1/id3v1tag.cpp +++ b/taglib/mpeg/id3v1/id3v1tag.cpp @@ -76,8 +76,7 @@ ByteVector ID3v1::StringHandler::render(const String &s) const { if(s.isLatin1()) return s.data(String::Latin1); - else - return ByteVector(); + return ByteVector(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp index 7cb3f3e8..b6e6ae55 100644 --- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp +++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp @@ -274,7 +274,7 @@ TableOfContentsFrame *TableOfContentsFrame::findTopLevel(const ID3v2::Tag *tag) ++it) { TableOfContentsFrame *frame = dynamic_cast(*it); - if(frame && frame->isTopLevel() == true) + if(frame && frame->isTopLevel()) return frame; } diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp index 74b4c9d8..f8abcbbf 100644 --- a/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/taglib/mpeg/id3v2/id3v2frame.cpp @@ -94,8 +94,7 @@ ByteVector Frame::textDelimiter(String::Type t) { if(t == String::UTF16 || t == String::UTF16BE || t == String::UTF16LE) return ByteVector(2, '\0'); - else - return ByteVector(1, '\0'); + return ByteVector(1, '\0'); } const String Frame::instrumentPrefix("PERFORMER:"); @@ -117,11 +116,11 @@ Frame *Frame::createTextualFrame(const String &key, const StringList &values) // TextIdentificationFrame *frame = new TextIdentificationFrame(frameID, String::UTF8); frame->setText(values); return frame; - } else if((frameID[0] == 'W') && (values.size() == 1)){ // URL frame (not WXXX); support only one value + } if((frameID[0] == 'W') && (values.size() == 1)){ // URL frame (not WXXX); support only one value UrlLinkFrame* frame = new UrlLinkFrame(frameID); frame->setUrl(values.front()); return frame; - } else if(frameID == "PCST") { + } if(frameID == "PCST") { return new PodcastFrame(); } } @@ -166,16 +165,14 @@ ByteVector Frame::frameID() const { if(d->header) return d->header->frameID(); - else - return ByteVector(); + return ByteVector(); } unsigned int Frame::size() const { if(d->header) return d->header->frameSize(); - else - return 0; + return 0; } void Frame::setData(const ByteVector &data) @@ -309,10 +306,8 @@ String::Type Frame::checkEncoding(const StringList &fields, String::Type encodin debug("Frame::checkEncoding() -- Rendering using UTF8."); return String::UTF8; } - else { - debug("Frame::checkEncoding() -- Rendering using UTF16."); - return String::UTF16; - } + debug("Frame::checkEncoding() -- Rendering using UTF16."); + return String::UTF16; } } @@ -486,19 +481,19 @@ PropertyMap Frame::asProperties() const if(id == "TXXX") return dynamic_cast< const UserTextIdentificationFrame* >(this)->asProperties(); // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number), GRP1 (Grouping) are in fact text frames. - else if(id[0] == 'T' || id == "WFED" || id == "MVNM" || id == "MVIN" || id == "GRP1") + if(id[0] == 'T' || id == "WFED" || id == "MVNM" || id == "MVIN" || id == "GRP1") return dynamic_cast< const TextIdentificationFrame* >(this)->asProperties(); - else if(id == "WXXX") + if(id == "WXXX") return dynamic_cast< const UserUrlLinkFrame* >(this)->asProperties(); - else if(id[0] == 'W') + if(id[0] == 'W') return dynamic_cast< const UrlLinkFrame* >(this)->asProperties(); - else if(id == "COMM") + if(id == "COMM") return dynamic_cast< const CommentsFrame* >(this)->asProperties(); - else if(id == "USLT") + if(id == "USLT") return dynamic_cast< const UnsynchronizedLyricsFrame* >(this)->asProperties(); - else if(id == "UFID") + if(id == "UFID") return dynamic_cast< const UniqueFileIdentifierFrame* >(this)->asProperties(); - else if(id == "PCST") + if(id == "PCST") return dynamic_cast< const PodcastFrame* >(this)->asProperties(); PropertyMap m; m.unsupportedData().append(id); diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index 9fa4d113..9ab113fa 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -268,11 +268,9 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, const Header *tagHe if(frameID != "WXXX") { return new UrlLinkFrame(data, header); } - else { - UserUrlLinkFrame *f = new UserUrlLinkFrame(data, header); - d->setTextEncoding(f); - return f; - } + UserUrlLinkFrame *f = new UserUrlLinkFrame(data, header); + d->setTextEncoding(f); + return f; } // Unsynchronized lyric/text transcription (frames 4.8) diff --git a/taglib/mpeg/id3v2/id3v2header.cpp b/taglib/mpeg/id3v2/id3v2header.cpp index da4aba0a..3496cff6 100644 --- a/taglib/mpeg/id3v2/id3v2header.cpp +++ b/taglib/mpeg/id3v2/id3v2header.cpp @@ -137,8 +137,7 @@ unsigned int Header::completeTagSize() const { if(d->footerPresent) return d->tagSize + size() + Footer::size(); - else - return d->tagSize + size(); + return d->tagSize + size(); } void Header::setTagSize(unsigned int s) diff --git a/taglib/ogg/oggfile.cpp b/taglib/ogg/oggfile.cpp index 1311b5df..1f2cce93 100644 --- a/taglib/ogg/oggfile.cpp +++ b/taglib/ogg/oggfile.cpp @@ -41,8 +41,7 @@ namespace { if(page->header()->lastPacketCompleted()) return page->firstPacketIndex() + page->packetCount(); - else - return page->firstPacketIndex() + page->packetCount() - 1; + return page->firstPacketIndex() + page->packetCount() - 1; } } // namespace diff --git a/taglib/riff/wav/infotag.cpp b/taglib/riff/wav/infotag.cpp index b2c6372a..716701df 100644 --- a/taglib/riff/wav/infotag.cpp +++ b/taglib/riff/wav/infotag.cpp @@ -176,8 +176,7 @@ String RIFF::Info::Tag::fieldText(const ByteVector &id) const { if(d->fieldListMap.contains(id)) return String(d->fieldListMap[id]); - else - return String(); + return String(); } void RIFF::Info::Tag::setFieldText(const ByteVector &id, const String &s) @@ -219,8 +218,7 @@ ByteVector RIFF::Info::Tag::render() const if(data.size() == 4) return ByteVector(); - else - return data; + return data; } void RIFF::Info::Tag::setStringHandler(const StringHandler *handler) diff --git a/taglib/tagunion.cpp b/taglib/tagunion.cpp index 64d786b9..85741b0d 100644 --- a/taglib/tagunion.cpp +++ b/taglib/tagunion.cpp @@ -120,16 +120,16 @@ PropertyMap TagUnion::properties() const if(dynamic_cast(d->tags[i])) return dynamic_cast(d->tags[i])->properties(); - else if(dynamic_cast(d->tags[i])) + if(dynamic_cast(d->tags[i])) return dynamic_cast(d->tags[i])->properties(); - else if(dynamic_cast(d->tags[i])) + if(dynamic_cast(d->tags[i])) return dynamic_cast(d->tags[i])->properties(); - else if(dynamic_cast(d->tags[i])) + if(dynamic_cast(d->tags[i])) return dynamic_cast(d->tags[i])->properties(); - else if(dynamic_cast(d->tags[i])) + if(dynamic_cast(d->tags[i])) return dynamic_cast(d->tags[i])->properties(); } } diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp index 684dd54c..b0d3aa90 100644 --- a/taglib/toolkit/tbytevector.cpp +++ b/taglib/toolkit/tbytevector.cpp @@ -145,8 +145,7 @@ T toNumber(const ByteVector &v, size_t offset, bool mostSignificantByteFirst) if(swap) return Utils::byteSwap(tmp); - else - return tmp; + return tmp; } template @@ -242,14 +241,12 @@ long double toFloat80(const ByteVector &v, size_t offset) debug("toFloat80() - can't handle the infinity or NaN. Returning 0."); return 0.0; } - else - val = ::ldexp(static_cast(fraction), exponent - 16383 - 63); + val = ::ldexp(static_cast(fraction), exponent - 16383 - 63); } if(negative) return -val; - else - return val; + return val; } class ByteVector::ByteVectorPrivate @@ -300,8 +297,7 @@ ByteVector ByteVector::fromCString(const char *s, unsigned int length) { if(length == 0xffffffff) return ByteVector(s, static_cast(::strlen(s))); - else - return ByteVector(s, length); + return ByteVector(s, length); } ByteVector ByteVector::fromUInt(unsigned int value, bool mostSignificantByteFirst) @@ -443,8 +439,7 @@ int ByteVector::rfind(const ByteVector &pattern, unsigned int offset, int byteAl if(pos == -1) return -1; - else - return size() - pos - pattern.size(); + return size() - pos - pattern.size(); } bool ByteVector::containsAt(const ByteVector &pattern, unsigned int offset, unsigned int patternOffset, unsigned int patternLength) const @@ -843,8 +838,7 @@ bool ByteVector::operator<(const ByteVector &v) const const int result = ::memcmp(data(), v.data(), std::min(size(), v.size())); if(result != 0) return result < 0; - else - return size() < v.size(); + return size() < v.size(); } bool ByteVector::operator>(const ByteVector &v) const diff --git a/taglib/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp index aff1684d..b7d0be4d 100644 --- a/taglib/toolkit/tfile.cpp +++ b/taglib/toolkit/tfile.cpp @@ -185,42 +185,41 @@ PropertyMap File::setProperties(const PropertyMap &properties) { if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else if(dynamic_cast(this)) + if(dynamic_cast(this)) return dynamic_cast(this)->setProperties(properties); - else - return tag()->setProperties(properties); + return tag()->setProperties(properties); } ByteVector File::readBlock(unsigned long length) diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp index 81883066..06aabbd8 100644 --- a/taglib/toolkit/tfilestream.cpp +++ b/taglib/toolkit/tfilestream.cpp @@ -250,7 +250,7 @@ void FileStream::insert(const ByteVector &data, unsigned long start, unsigned lo writeBlock(data); return; } - else if(data.size() < replace) { + if(data.size() < replace) { seek(start); writeBlock(data); removeBlock(start + data.size(), replace - data.size()); diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp index 15258e74..669cd0eb 100644 --- a/taglib/toolkit/tstring.cpp +++ b/taglib/toolkit/tstring.cpp @@ -44,8 +44,7 @@ namespace { if(Utils::systemByteOrder() == Utils::LittleEndian) return String::UTF16LE; - else - return String::UTF16BE; + return String::UTF16BE; } // Converts a Latin-1 string into UTF-16(without BOM/CPU byte order) @@ -342,10 +341,8 @@ StringList String::split(const String &separator) const list.append(substr(index, size() - index)); break; } - else { - list.append(substr(index, sep - index)); - index = sep + separator.size(); - } + list.append(substr(index, sep - index)); + index = sep + separator.size(); } return list; } @@ -362,8 +359,7 @@ String String::substr(unsigned int position, unsigned int n) const { if(position == 0 && n >= size()) return *this; - else - return String(d->data.substr(position, n)); + return String(d->data.substr(position, n)); } String &String::append(const String &s)