From e0a913b16c3a5629ce2b9f7574693cbdcc73139e Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 13 Jul 2021 00:41:49 +0200 Subject: [PATCH] Apply clang-format --- libpkg/tests/data.cpp | 3 +-- librepomgr/buildactions/reloadlibrarydependencies.cpp | 3 ++- librepomgr/webclient/database.cpp | 3 ++- librepomgr/webclient/database.h | 3 ++- librepomgr/webclient/session.cpp | 3 ++- librepomgr/webclient/session.h | 3 ++- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libpkg/tests/data.cpp b/libpkg/tests/data.cpp index 42a7dea..c7b4173 100644 --- a/libpkg/tests/data.cpp +++ b/libpkg/tests/data.cpp @@ -181,8 +181,7 @@ void DataTests::testDependencyMatching() "equal constraint with explicitly specified pkgrel must not match", !pkg3.providesDependency(Dependency::fromString(depStr, 16))); depStr = "crypto++>=5.6.5-1"; - CPPUNIT_ASSERT_MESSAGE( - "greater equal constraint with explicitly specified pkgrel", pkg2.providesDependency(Dependency::fromString(depStr, 17))); + CPPUNIT_ASSERT_MESSAGE("greater equal constraint with explicitly specified pkgrel", pkg2.providesDependency(Dependency::fromString(depStr, 17))); CPPUNIT_ASSERT_MESSAGE("greater equal constraint, default pkgrel should match", pkg2.providesDependency(Dependency::fromString(depStr, 15))); CPPUNIT_ASSERT_MESSAGE("greater equal constrainer, any pkgrel should match", pkg3.providesDependency(Dependency::fromString(depStr, 15))); CPPUNIT_ASSERT_MESSAGE( diff --git a/librepomgr/buildactions/reloadlibrarydependencies.cpp b/librepomgr/buildactions/reloadlibrarydependencies.cpp index 26528d5..e969716 100644 --- a/librepomgr/buildactions/reloadlibrarydependencies.cpp +++ b/librepomgr/buildactions/reloadlibrarydependencies.cpp @@ -238,7 +238,8 @@ void LibRepoMgr::ReloadLibraryDependencies::downloadPackagesFromMirror() m_buildAction->appendOutput(Phrases::SuccessMessage, "Downloading ", packagesWhichNeedCaching, " binary packages from mirror ...\n"); WebClient::cachePackages(m_buildAction->log(), std::make_shared(m_cachingData, m_setup.building.ioContext, m_setup.webServer.sslContext, - std::bind(&ReloadLibraryDependencies::loadPackageInfoFromContents, this)), m_packageDownloadSizeLimit); + std::bind(&ReloadLibraryDependencies::loadPackageInfoFromContents, this)), + m_packageDownloadSizeLimit); } void ReloadLibraryDependencies::loadPackageInfoFromContents() diff --git a/librepomgr/webclient/database.cpp b/librepomgr/webclient/database.cpp index beb460b..b084de2 100644 --- a/librepomgr/webclient/database.cpp +++ b/librepomgr/webclient/database.cpp @@ -190,7 +190,8 @@ PackageCachingDataForPackage *PackageCachingSession::getCurrentDataAndSelectNext return data; } -void cachePackages(LogContext &log, std::shared_ptr &&packageCachingSession, std::optional bodyLimit, std::size_t maxParallelDownloads) +void cachePackages(LogContext &log, std::shared_ptr &&packageCachingSession, std::optional bodyLimit, + std::size_t maxParallelDownloads) { for (std::size_t startedDownloads = 0; startedDownloads < maxParallelDownloads; ++startedDownloads) { auto *const cachingData = packageCachingSession->getCurrentDataAndSelectNext(); diff --git a/librepomgr/webclient/database.h b/librepomgr/webclient/database.h index 7b5e996..bd150b5 100644 --- a/librepomgr/webclient/database.h +++ b/librepomgr/webclient/database.h @@ -45,7 +45,8 @@ using PackageCachingDataForDatabase = std::unordered_map; struct PackageCachingSession; -void cachePackages(LogContext &log, std::shared_ptr &&packageCachingSession, std::optional bodyLimit = std::nullopt, std::size_t maxParallelDownloads = 8); +void cachePackages(LogContext &log, std::shared_ptr &&packageCachingSession, + std::optional bodyLimit = std::nullopt, std::size_t maxParallelDownloads = 8); struct PackageCachingSession : public MultiSession { friend void cachePackages(LogContext &, std::shared_ptr &&, std::optional, std::size_t); diff --git a/librepomgr/webclient/session.cpp b/librepomgr/webclient/session.cpp index 9be10df..629937b 100644 --- a/librepomgr/webclient/session.cpp +++ b/librepomgr/webclient/session.cpp @@ -41,7 +41,8 @@ void Session::setChunkHandler(ChunkHandler &&handler) m_chunkProcessing->handler = std::move(handler); } -void Session::run(const char *host, const char *port, http::verb verb, const char *target, std::optional bodyLimit, unsigned int version) +void Session::run( + const char *host, const char *port, http::verb verb, const char *target, std::optional bodyLimit, unsigned int version) { // set SNI Hostname (many hosts need this to handshake successfully) auto *const sslStream = std::get_if(&m_stream); diff --git a/librepomgr/webclient/session.h b/librepomgr/webclient/session.h index cc7a8f6..a43bdb0 100644 --- a/librepomgr/webclient/session.h +++ b/librepomgr/webclient/session.h @@ -62,7 +62,8 @@ public: explicit Session(boost::asio::io_context &ioContext, boost::asio::ssl::context &sslContext, Handler &&handler); void setChunkHandler(ChunkHandler &&handler); - void run(const char *host, const char *port, boost::beast::http::verb verb, const char *target, std::optional bodyLimit = std::nullopt, unsigned int version = 11); + void run(const char *host, const char *port, boost::beast::http::verb verb, const char *target, + std::optional bodyLimit = std::nullopt, unsigned int version = 11); private: using RawSocket = boost::asio::ip::tcp::socket;