From d3352e476fb72945f3d3ea86d91354dfdaf41e0f Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 21 Jul 2023 07:17:58 +0200 Subject: [PATCH] Remove `< 0` check on unsigned --- ext/libstrawberry-tagreader/tagreadergme.cpp | 7 +++---- src/scrobbler/scrobblercache.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ext/libstrawberry-tagreader/tagreadergme.cpp b/ext/libstrawberry-tagreader/tagreadergme.cpp index 734100cd..2883aee4 100644 --- a/ext/libstrawberry-tagreader/tagreadergme.cpp +++ b/ext/libstrawberry-tagreader/tagreadergme.cpp @@ -98,9 +98,8 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so file.seek(INTRO_LENGTH_OFFSET); QByteArray length_bytes = file.read(INTRO_LENGTH_SIZE); - quint64 length_in_sec = 0; if (length_bytes.size() >= INTRO_LENGTH_SIZE) { - length_in_sec = ConvertSPCStringToNum(length_bytes); + quint64 length_in_sec = ConvertSPCStringToNum(length_bytes); if (!length_in_sec || length_in_sec >= 0x1FFF) { // This means that parsing the length as a string failed, so get value LE. @@ -250,11 +249,11 @@ bool GME::VGM::GetPlaybackLength(const QByteArray &sample_count_bytes, const QBy quint64 sample_count = GME::UnpackBytes32(sample_count_bytes.constData(), sample_count_bytes.size()); - if (sample_count <= 0) return false; + if (sample_count == 0) return false; quint64 loop_sample_count = GME::UnpackBytes32(loop_count_bytes.constData(), loop_count_bytes.size()); - if (loop_sample_count <= 0) { + if (loop_sample_count == 0) { out_length = sample_count * 1000 / SAMPLE_TIMEBASE; return true; } diff --git a/src/scrobbler/scrobblercache.cpp b/src/scrobbler/scrobblercache.cpp index eb8c05be..6b50ba8d 100644 --- a/src/scrobbler/scrobblercache.cpp +++ b/src/scrobbler/scrobblercache.cpp @@ -143,7 +143,7 @@ void ScrobblerCache::ReadCache() { metadata.albumartist = json_obj_track["albumartist"].toString(); metadata.length_nanosec = json_obj_track["length_nanosec"].toVariant().toLongLong(); - if (timestamp <= 0 || metadata.artist.isEmpty() || metadata.title.isEmpty() || metadata.length_nanosec <= 0) { + if (timestamp == 0 || metadata.artist.isEmpty() || metadata.title.isEmpty() || metadata.length_nanosec <= 0) { qLog(Error) << "Invalid cache data" << "for song" << metadata.title; continue; }