oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branches 'neheb/1', 'neheb/2', 'neheb/3', 'neheb/4' and 'neheb/5'

Browse Source
This commit is contained in:
Max Kellermann
2021-11-20 07:55:24 +01:00
parent eea2d35d3a 4e0e4c00bf 00f8d65a17 cfe2dd4147 5deca66fdc 837fc98638
commit f74996c02f
72 changed files with 211 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/curl/Global.cxx
View File

@@ -61,7 +61,7 @@ public:
CurlSocket(const CurlSocket &) = delete;
CurlSocket &operator=(const CurlSocket &) = delete;
auto &GetEventLoop() const noexcept {
[[nodiscard]] auto &GetEventLoop() const noexcept {
return socket_event.GetEventLoop();
}
@@ -73,7 +73,7 @@ public:
void *userp, void *socketp) noexcept;
private:
SocketDescriptor GetSocket() const noexcept {
[[nodiscard]] SocketDescriptor GetSocket() const noexcept {
return socket_event.GetSocket();
}

4
src/lib/curl/Init.cxx
View File

@@ -40,7 +40,7 @@ CurlGlobal *CurlInit::instance;
CurlInit::CurlInit(EventLoop &event_loop)
{
const std::lock_guard<Mutex> protect(mutex);
const std::scoped_lock<Mutex> protect(mutex);
if (++ref > 1) {
assert(&event_loop == &instance->GetEventLoop());
return;
@@ -56,7 +56,7 @@ CurlInit::CurlInit(EventLoop &event_loop)
CurlInit::~CurlInit() noexcept
{
const std::lock_guard<Mutex> protect(mutex);
const std::scoped_lock<Mutex> protect(mutex);
if (--ref > 0)
return;

4
src/lib/icu/Converter.cxx
View File

@@ -105,7 +105,7 @@ AllocatedString
IcuConverter::ToUTF8(std::string_view s) const
{
#ifdef HAVE_ICU
const std::lock_guard<Mutex> protect(mutex);
const std::scoped_lock<Mutex> protect(mutex);
ucnv_resetToUnicode(converter);
@@ -133,7 +133,7 @@ AllocatedString
IcuConverter::FromUTF8(std::string_view s) const
{
#ifdef HAVE_ICU
const std::lock_guard<Mutex> protect(mutex);
const std::scoped_lock<Mutex> protect(mutex);
const auto u = UCharFromUTF8(s);

2
src/lib/nfs/Blocking.hxx
View File

@@ -68,7 +68,7 @@ private:
* thread.
*/
void LockSetFinished() noexcept {
const std::lock_guard<Mutex> protect(mutex);
const std::scoped_lock<Mutex> protect(mutex);
finished = true;
cond.notify_one();
}

2
src/lib/smbclient/Context.cxx
View File

@@ -45,7 +45,7 @@ SmbclientContext::New()
SMBCCTX *ctx;
{
const std::lock_guard<Mutex> protect(global_mutex);
const std::scoped_lock<Mutex> protect(global_mutex);
ctx = smbc_new_context();
}

2
src/lib/smbclient/Context.hxx
View File

@@ -48,7 +48,7 @@ public:
~SmbclientContext() noexcept {
if (ctx != nullptr) {
const std::lock_guard<Mutex> protect(global_mutex);
const std::scoped_lock<Mutex> protect(global_mutex);
smbc_free_context(ctx, 1);
}
}

4
src/lib/upnp/ClientInit.cxx
View File

@@ -62,7 +62,7 @@ UpnpClientGlobalInit(const char* iface)
UpnpGlobalInit(iface);
try {
const std::lock_guard<Mutex> protect(upnp_client_init_mutex);
const std::scoped_lock<Mutex> protect(upnp_client_init_mutex);
if (upnp_client_ref == 0)
DoInit();
} catch (...) {
@@ -78,7 +78,7 @@ void
UpnpClientGlobalFinish() noexcept
{
{
const std::lock_guard<Mutex> protect(upnp_client_init_mutex);
const std::scoped_lock<Mutex> protect(upnp_client_init_mutex);
assert(upnp_client_ref > 0);
if (--upnp_client_ref == 0)

20
src/lib/upnp/Discovery.cxx
View File

@@ -41,14 +41,14 @@ UPnPDeviceDirectory::Downloader::Downloader(UPnPDeviceDirectory &_parent,
expires(std::chrono::seconds(UpnpDiscovery_get_Expires(&disco))),
request(*parent.curl, url.c_str(), *this)
{
const std::lock_guard<Mutex> protect(parent.mutex);
const std::scoped_lock<Mutex> protect(parent.mutex);
parent.downloaders.push_back(*this);
}
void
UPnPDeviceDirectory::Downloader::Destroy() noexcept
{
const std::lock_guard<Mutex> protect(parent.mutex);
const std::scoped_lock<Mutex> protect(parent.mutex);
unlink();
delete this;
}
@@ -139,7 +139,7 @@ AnnounceLostUPnP(UPnPDiscoveryListener &listener, const UPnPDevice &device)
inline void
UPnPDeviceDirectory::LockAdd(ContentDirectoryDescriptor &&d)
{
const std::lock_guard<Mutex> protect(mutex);
const std::scoped_lock<Mutex> protect(mutex);
for (auto &i : directories) {
if (i.id == d.id) {
@@ -157,7 +157,7 @@ UPnPDeviceDirectory::LockAdd(ContentDirectoryDescriptor &&d)
inline void
UPnPDeviceDirectory::LockRemove(const std::string &id)
{
const std::lock_guard<Mutex> protect(mutex);
const std::scoped_lock<Mutex> protect(mutex);
for (auto i = directories.begin(), end = directories.end();
i != end; ++i) {
@@ -265,10 +265,10 @@ UPnPDeviceDirectory::UPnPDeviceDirectory(EventLoop &event_loop,
UPnPDeviceDirectory::~UPnPDeviceDirectory() noexcept
{
BlockingCall(GetEventLoop(), [this](){
const std::lock_guard<Mutex> protect(mutex);
downloaders.clear_and_dispose(DeleteDisposer());
});
BlockingCall(GetEventLoop(), [this]() {
const std::scoped_lock<Mutex> protect(mutex);
downloaders.clear_and_dispose(DeleteDisposer());
});
}
inline EventLoop &
@@ -308,7 +308,7 @@ UPnPDeviceDirectory::Search()
std::vector<ContentDirectoryService>
UPnPDeviceDirectory::GetDirectories()
{
const std::lock_guard<Mutex> protect(mutex);
const std::scoped_lock<Mutex> protect(mutex);
ExpireDevices();
@@ -327,7 +327,7 @@ UPnPDeviceDirectory::GetDirectories()
ContentDirectoryService
UPnPDeviceDirectory::GetServer(std::string_view friendly_name)
{
const std::lock_guard<Mutex> protect(mutex);
const std::scoped_lock<Mutex> protect(mutex);
ExpireDevices();

4
src/lib/upnp/Init.cxx
View File

@@ -56,7 +56,7 @@ DoInit(const char* iface)
void
UpnpGlobalInit(const char* iface)
{
const std::lock_guard<Mutex> protect(upnp_init_mutex);
const std::scoped_lock<Mutex> protect(upnp_init_mutex);
if (upnp_ref == 0)
DoInit(iface);
@@ -67,7 +67,7 @@ UpnpGlobalInit(const char* iface)
void
UpnpGlobalFinish() noexcept
{
const std::lock_guard<Mutex> protect(upnp_init_mutex);
const std::scoped_lock<Mutex> protect(upnp_init_mutex);
assert(upnp_ref > 0);