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

Merge tag 'v0.21.7'

Browse Source 
release v0.21.7
This commit is contained in:
Max Kellermann
2019-04-03 12:32:20 +02:00
parent 508e522188 ef10354d06
commit 7a1b56fe96
12 changed files with 83 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/input/plugins/CurlInputPlugin.cxx
View File

@@ -306,9 +306,8 @@ input_curl_init(EventLoop &event_loop, const ConfigBlock &block)
{
try {
curl_init = new CurlInit(event_loop);
} catch (const std::runtime_error &e) {
LogError(e);
throw PluginUnavailable(e.what());
} catch (...) {
std::throw_with_nested(PluginUnavailable("CURL initialization failed"));
}
const auto version_info = curl_version_info(CURLVERSION_FIRST);

7
src/input/plugins/SmbclientInputPlugin.cxx
View File

@@ -28,8 +28,6 @@
#include <libsmbclient.h>
#include <stdexcept>
class SmbclientInputStream final : public InputStream {
SMBCCTX *ctx;
int fd;
@@ -72,9 +70,8 @@ input_smbclient_init(EventLoop &, const ConfigBlock &)
{
try {
SmbclientInit();
} catch (const std::runtime_error &e) {
// TODO: use std::throw_with_nested()?
throw PluginUnavailable(e.what());
} catch (...) {
std::throw_with_nested(PluginUnavailable("libsmbclient initialization failed"));
}
// TODO: create one global SMBCCTX here?