From 1fd8d460646cd8a01e0cc1a8c310f395b472cae1 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Tue, 2 Jan 2018 12:22:44 +0100
Subject: [PATCH] lib/upnp/ClientInit: return UpnpClient_Handle

---
 src/db/plugins/upnp/UpnpDatabasePlugin.cxx  | 2 +-
 src/lib/upnp/ClientInit.cxx                 | 6 +++---
 src/lib/upnp/ClientInit.hxx                 | 4 ++--
 src/neighbor/plugins/UpnpNeighborPlugin.cxx | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
index 6f30771c5..f25b27f10 100644
--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
@@ -153,7 +153,7 @@ UpnpDatabase::Create(EventLoop &, EventLoop &io_event_loop,
 void
 UpnpDatabase::Open()
 {
-	UpnpClientGlobalInit(handle);
+	handle = UpnpClientGlobalInit();
 
 	discovery = new UPnPDeviceDirectory(event_loop, handle);
 	try {
diff --git a/src/lib/upnp/ClientInit.cxx b/src/lib/upnp/ClientInit.cxx
index 2fd891b83..76332cfd2 100644
--- a/src/lib/upnp/ClientInit.cxx
+++ b/src/lib/upnp/ClientInit.cxx
@@ -60,8 +60,8 @@ DoInit()
 					 UpnpGetErrorMessage(code));
 }
 
-void
-UpnpClientGlobalInit(UpnpClient_Handle &handle)
+UpnpClient_Handle
+UpnpClientGlobalInit()
 {
 	UpnpGlobalInit();
 
@@ -75,7 +75,7 @@ UpnpClientGlobalInit(UpnpClient_Handle &handle)
 	}
 
 	++upnp_client_ref;
-	handle = upnp_client_handle;
+	return upnp_client_handle;
 }
 
 void
diff --git a/src/lib/upnp/ClientInit.hxx b/src/lib/upnp/ClientInit.hxx
index f45901eff..3a17b5b83 100644
--- a/src/lib/upnp/ClientInit.hxx
+++ b/src/lib/upnp/ClientInit.hxx
@@ -24,8 +24,8 @@
 
 #include <upnp.h>
 
-void
-UpnpClientGlobalInit(UpnpClient_Handle &handle);
+UpnpClient_Handle
+UpnpClientGlobalInit();
 
 void
 UpnpClientGlobalFinish() noexcept;
diff --git a/src/neighbor/plugins/UpnpNeighborPlugin.cxx b/src/neighbor/plugins/UpnpNeighborPlugin.cxx
index 6d160be7f..b034fa96d 100644
--- a/src/neighbor/plugins/UpnpNeighborPlugin.cxx
+++ b/src/neighbor/plugins/UpnpNeighborPlugin.cxx
@@ -76,8 +76,7 @@ private:
 void
 UpnpNeighborExplorer::Open()
 {
-	UpnpClient_Handle handle;
-	UpnpClientGlobalInit(handle);
+	auto handle = UpnpClientGlobalInit();
 
 	discovery = new UPnPDeviceDirectory(event_loop, handle, this);