lib/upnp/ClientInit: return UpnpClient_Handle

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 {

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

src/lib/upnp/ClientInit.hxx

@@ -24,8 +24,8 @@
 
 #include <upnp.h>
 
-void
-UpnpClientGlobalInit(UpnpClient_Handle &handle);
+UpnpClient_Handle
+UpnpClientGlobalInit();
 
 void
 UpnpClientGlobalFinish() noexcept;

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);