mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-24 21:40:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UPnP: cleanup variable name desc_xml

Browse Source
This commit is contained in:
Michael M 2017-08-06 23:58:00 -07:00
parent ff1d1a7a4d
commit a09f8744b9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Common/UPnP.cpp
View File

@ -32,7 +32,7 @@ static bool InitUPnP()
static bool s_error = false; static bool s_error = false;
std::vector<UPNPDev*> igds; std::vector<UPNPDev*> igds;
int descXMLsize = 0, upnperror = 0; int upnperror = 0;
// Don't init if already inited // Don't init if already inited
if (s_inited) if (s_inited)
@ -70,19 +70,20 @@ static bool InitUPnP()
for (const UPNPDev* dev : igds) for (const UPNPDev* dev : igds)
{ {
std::unique_ptr<char, decltype(&std::free)> descXML(nullptr, std::free); int desc_xml_size = 0;
std::unique_ptr<char, decltype(&std::free)> desc_xml(nullptr, std::free);
int statusCode = 200; int statusCode = 200;
#if MINIUPNPC_API_VERSION >= 16 #if MINIUPNPC_API_VERSION >= 16
descXML.reset( desc_xml.reset(
static_cast<char*>(miniwget_getaddr(dev->descURL, &descXMLsize, s_our_ip.data(), static_cast<char*>(miniwget_getaddr(dev->descURL, &desc_xml_size, s_our_ip.data(),
static_cast<int>(s_our_ip.size()), 0, &statusCode))); static_cast<int>(s_our_ip.size()), 0, &statusCode)));
#else #else
descXML.reset(static_cast<char*>(miniwget_getaddr(dev->descURL, &descXMLsize, s_our_ip.data(), desc_xml.reset(static_cast<char*>(miniwget_getaddr(
static_cast<int>(s_our_ip.size()), 0))); dev->descURL, &desc_xml_size, s_our_ip.data(), static_cast<int>(s_our_ip.size()), 0)));
#endif #endif
if (descXML && statusCode == 200) if (desc_xml && statusCode == 200)
{ {
parserootdesc(descXML.get(), descXMLsize, &s_data); parserootdesc(desc_xml.get(), desc_xml_size, &s_data);
GetUPNPUrls(&s_urls, &s_data, dev->descURL, 0); GetUPNPUrls(&s_urls, &s_data, dev->descURL, 0);
NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL); NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL);