From 1def36b8f0ac1287876f10ca0f25f47439e98b69 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 14 Dec 2022 20:49:59 +0100 Subject: [PATCH] Fixed some code scanning alerts --- src/libs/metadata/impl/Utils.hpp | 2 ++ src/libs/services/database/impl/Migration.cpp | 2 +- src/libs/services/database/test/DatabaseTest.cpp | 4 ++-- src/libs/services/database/test/Release.cpp | 8 +++++--- .../impl/features/FeaturesEngine.cpp | 2 +- .../scrobbling/impl/listenbrainz/Exception.hpp | 2 ++ .../impl/listenbrainz/FeedbacksParser.cpp | 1 - .../impl/listenbrainz/FeedbacksParser.hpp | 2 ++ .../impl/listenbrainz/FeedbacksSynchronizer.cpp | 4 ++-- .../impl/listenbrainz/ListensSynchronizer.cpp | 4 ++-- src/libs/subsonic/impl/SubsonicResource.cpp | 15 +++++++-------- src/lms/ui/resource/DownloadResource.cpp | 3 +-- src/tools/zipper/LmsZipper.cpp | 1 - 13 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/libs/metadata/impl/Utils.hpp b/src/libs/metadata/impl/Utils.hpp index 20caf73c..021d7619 100644 --- a/src/libs/metadata/impl/Utils.hpp +++ b/src/libs/metadata/impl/Utils.hpp @@ -18,6 +18,8 @@ * along with LMS. If not, see . */ +#pragma once + #include #include diff --git a/src/libs/services/database/impl/Migration.cpp b/src/libs/services/database/impl/Migration.cpp index d9300fc2..753dbc19 100644 --- a/src/libs/services/database/impl/Migration.cpp +++ b/src/libs/services/database/impl/Migration.cpp @@ -467,7 +467,7 @@ CREATE TABLE "starred_track" ( return itScrobbler->second; auto query {session.getDboSession().query("SELECT scrobbler FROM user WHERE id = ?").bind(userId)}; - auto [itInserted, inserted] {userScrobblers.emplace(userId, query.resultValue())}; + [[maybe_unused]] auto [itInserted, inserted] {userScrobblers.emplace(userId, query.resultValue())}; assert(inserted); return itInserted->second; }}; diff --git a/src/libs/services/database/test/DatabaseTest.cpp b/src/libs/services/database/test/DatabaseTest.cpp index fc680fed..8e20b757 100644 --- a/src/libs/services/database/test/DatabaseTest.cpp +++ b/src/libs/services/database/test/DatabaseTest.cpp @@ -53,8 +53,8 @@ TEST_F(DatabaseFixture, MultiTracksSingleArtistSingleRelease) ASSERT_EQ(releases.results.size(), 1); EXPECT_EQ(releases.results.front(), release.getId()); - const auto tracks {Track::find(session, Track::FindParameters {}.setRelease(release.getId()))}; - EXPECT_EQ(tracks.results.size(), nbTracks); + const auto releaseTracks {Track::find(session, Track::FindParameters {}.setRelease(release.getId()))}; + EXPECT_EQ(releaseTracks.results.size(), nbTracks); } } diff --git a/src/libs/services/database/test/Release.cpp b/src/libs/services/database/test/Release.cpp index d1e77f44..6ba03920 100644 --- a/src/libs/services/database/test/Release.cpp +++ b/src/libs/services/database/test/Release.cpp @@ -39,9 +39,11 @@ TEST_F(DatabaseFixture, Release) EXPECT_EQ(Release::getCount(session), 1); EXPECT_TRUE(Release::exists(session, release.getId())); - auto releases {Release::findOrphans(session, Range {})}; - ASSERT_EQ(releases.results.size(), 1); - EXPECT_EQ(releases.results.front(), release.getId()); + { + auto releases {Release::findOrphans(session, Range {})}; + ASSERT_EQ(releases.results.size(), 1); + EXPECT_EQ(releases.results.front(), release.getId()); + } { auto releases {Release::find(session, Release::FindParameters {})}; diff --git a/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp b/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp index fddb0324..fc44eb48 100644 --- a/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp +++ b/src/libs/services/recommendation/impl/features/FeaturesEngine.cpp @@ -410,7 +410,7 @@ FeaturesEngine::load(const SOM::Network& network, const TrackPositions& trackPos auto itArtists {_artistMatrix.find(artistLink->getType())}; if (itArtists == std::cend(_artistMatrix)) { - auto [it, inserted] = _artistMatrix.try_emplace(artistLink->getType(), ArtistMatrix {width, height}); + [[maybe_unused]] auto [it, inserted] = _artistMatrix.try_emplace(artistLink->getType(), ArtistMatrix {width, height}); assert(inserted); itArtists = it; } diff --git a/src/libs/services/scrobbling/impl/listenbrainz/Exception.hpp b/src/libs/services/scrobbling/impl/listenbrainz/Exception.hpp index 6481bba7..b4714606 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/Exception.hpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/Exception.hpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#pragma once + #include "services/scrobbling/Exception.hpp" namespace Scrobbling::ListenBrainz diff --git a/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksParser.cpp b/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksParser.cpp index 359e90e6..e3ace6cb 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksParser.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksParser.cpp @@ -23,7 +23,6 @@ #include #include #include -//#include #include "services/scrobbling/Exception.hpp" #include "Exception.hpp" diff --git a/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksParser.hpp b/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksParser.hpp index 4b5644d6..d42098bd 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksParser.hpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksParser.hpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#pragma once + #include #include "FeedbackTypes.hpp" diff --git a/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksSynchronizer.cpp index 78e3d5e8..1e3e654d 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksSynchronizer.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksSynchronizer.cpp @@ -234,7 +234,7 @@ namespace Scrobbling::ListenBrainz auto itContext {_userContexts.find(userId)}; if (itContext == std::cend(_userContexts)) { - auto [itNewContext, inserted] {_userContexts.emplace(userId, userId)}; + [[maybe_unused]] auto [itNewContext, inserted] {_userContexts.emplace(userId, userId)}; itContext = itNewContext; } @@ -246,7 +246,7 @@ namespace Scrobbling::ListenBrainz { return std::any_of(std::cbegin(_userContexts), std::cend(_userContexts), [](const auto& contextEntry) { - const auto& [userId, context] {contextEntry}; + [[maybe_unused]] const auto& [userId, context] {contextEntry}; return context.syncing; }); } diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp index ecd43a50..2542ede7 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp @@ -354,7 +354,7 @@ namespace Scrobbling::ListenBrainz auto itContext {_userContexts.find(userId)}; if (itContext == std::cend(_userContexts)) { - auto [itNewContext, inserted] {_userContexts.emplace(userId, userId)}; + [[maybe_unused]] auto [itNewContext, inserted] {_userContexts.emplace(userId, userId)}; itContext = itNewContext; } @@ -366,7 +366,7 @@ namespace Scrobbling::ListenBrainz { return std::any_of(std::cbegin(_userContexts), std::cend(_userContexts), [](const auto& contextEntry) { - const auto& [userId, context] {contextEntry}; + [[maybe_unused]] const auto& [userId, context] {contextEntry}; return context.syncing; }); } diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp index d9140b89..82d1efa9 100644 --- a/src/libs/subsonic/impl/SubsonicResource.cpp +++ b/src/libs/subsonic/impl/SubsonicResource.cpp @@ -993,10 +993,9 @@ handleGetMusicDirectoryRequest(RequestContext& context) // Mandatory params const auto artistId {getParameterAs(context.parameters, "id")}; const auto releaseId {getParameterAs(context.parameters, "id")}; - const auto trackId {getParameterAs(context.parameters, "id")}; const auto root {getParameterAs(context.parameters, "id")}; - if (!root && !artistId && !releaseId && !trackId) + if (!root && !artistId && !releaseId) throw BadParameterGenericError {"id"}; Response response {Response::createOkResponse(context.serverProtocolVersion)}; @@ -1013,10 +1012,10 @@ handleGetMusicDirectoryRequest(RequestContext& context) directoryNode.setAttribute("id", idToString(RootId {})); directoryNode.setAttribute("name", "Music"); - auto artistIds {Artist::find(context.dbSession, Artist::FindParameters {}.setSortMethod(ArtistSortMethod::BySortName))}; - for (const ArtistId artistId : artistIds.results) + auto rootArtistIds {Artist::find(context.dbSession, Artist::FindParameters {}.setSortMethod(ArtistSortMethod::BySortName))}; + for (const ArtistId rootArtistId : rootArtistIds.results) { - const Artist::pointer artist {Artist::find(context.dbSession, artistId)}; + const Artist::pointer artist {Artist::find(context.dbSession, rootArtistId)}; directoryNode.addArrayChild("child", artistToResponseNode(artist, context.dbSession, user, false /* no id3 */)); } } @@ -1030,10 +1029,10 @@ handleGetMusicDirectoryRequest(RequestContext& context) directoryNode.setAttribute("name", makeNameFilesystemCompatible(artist->getName())); - const auto releases {Release::find(context.dbSession, Release::FindParameters {}.setArtist(*artistId))}; - for (const ReleaseId releaseId : releases.results) + const auto artistReleases {Release::find(context.dbSession, Release::FindParameters {}.setArtist(*artistId))}; + for (const ReleaseId artistReleaseId : artistReleases.results) { - const Release::pointer release {Release::find(context.dbSession, releaseId)}; + const Release::pointer release {Release::find(context.dbSession, artistReleaseId)}; directoryNode.addArrayChild("child", releaseToResponseNode(release, context.dbSession, user, false /* no id3 */)); } } diff --git a/src/lms/ui/resource/DownloadResource.cpp b/src/lms/ui/resource/DownloadResource.cpp index 9bc2dac7..0d55bcb6 100644 --- a/src/lms/ui/resource/DownloadResource.cpp +++ b/src/lms/ui/resource/DownloadResource.cpp @@ -54,8 +54,7 @@ DownloadResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Resp std::shared_ptr zipper; // First, see if this request is for a continuation - Wt::Http::ResponseContinuation *continuation = request.continuation(); - if (continuation) + if (Wt::Http::ResponseContinuation *continuation {request.continuation()}) zipper = Wt::cpp17::any_cast>(continuation->data()); else { diff --git a/src/tools/zipper/LmsZipper.cpp b/src/tools/zipper/LmsZipper.cpp index 05e3fbc5..51a494f3 100644 --- a/src/tools/zipper/LmsZipper.cpp +++ b/src/tools/zipper/LmsZipper.cpp @@ -66,7 +66,6 @@ int main(int argc, char* argv[]) Zip::SizeType nbTotalWrittenBytes {}; while (!zipper.isComplete()) { - //std::array buffer; std::array buffer; const Zip::SizeType nbWrittenBytes {zipper.writeSome(buffer.data(), buffer.size())};