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

lib/upnp/Error: wrap libupnp errors in std::system_error

Browse Source
This commit is contained in:
Max Kellermann
2022-11-29 00:29:15 +01:00
parent ed08a4bd58
commit 1f33ac3e98
6 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,12 +20,12 @@
#include "Discovery.hxx"
#include "ContentDirectoryService.hxx"
#include "Log.hxx"
#include "Error.hxx"
#include "lib/curl/Global.hxx"
#include "event/Call.hxx"
#include "util/DeleteDisposer.hxx"
#include "util/ScopeExit.hxx"
#include "util/SpanCast.hxx"
#include "util/RuntimeError.hxx"
#include <upnptools.h>
@@ -296,14 +296,12 @@ UPnPDeviceDirectory::Search()
int code = UpnpSearchAsync(handle, search_timeout,
ContentDirectorySType, GetUpnpCookie());
if (code != UPNP_E_SUCCESS)
throw FormatRuntimeError("UpnpSearchAsync() failed: %s",
UpnpGetErrorMessage(code));
throw Upnp::MakeError(code, "UpnpSearchAsync() failed");
code = UpnpSearchAsync(handle, search_timeout,
MediaServerDType, GetUpnpCookie());
if (code != UPNP_E_SUCCESS)
throw FormatRuntimeError("UpnpSearchAsync() failed: %s",
UpnpGetErrorMessage(code));
throw Upnp::MakeError(code, "UpnpSearchAsync() failed");
}
std::vector<ContentDirectoryService>