From a09f8744b9ef1c003e8271d031c3da93cb711635 Mon Sep 17 00:00:00 2001 From: Michael M Date: Sun, 6 Aug 2017 23:58:00 -0700 Subject: [PATCH] UPnP: cleanup variable name desc_xml --- Source/Core/Common/UPnP.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Source/Core/Common/UPnP.cpp b/Source/Core/Common/UPnP.cpp index bedecf9a43..411beb45f0 100644 --- a/Source/Core/Common/UPnP.cpp +++ b/Source/Core/Common/UPnP.cpp @@ -32,7 +32,7 @@ static bool InitUPnP() static bool s_error = false; std::vector igds; - int descXMLsize = 0, upnperror = 0; + int upnperror = 0; // Don't init if already inited if (s_inited) @@ -70,19 +70,20 @@ static bool InitUPnP() for (const UPNPDev* dev : igds) { - std::unique_ptr descXML(nullptr, std::free); + int desc_xml_size = 0; + std::unique_ptr desc_xml(nullptr, std::free); int statusCode = 200; #if MINIUPNPC_API_VERSION >= 16 - descXML.reset( - static_cast(miniwget_getaddr(dev->descURL, &descXMLsize, s_our_ip.data(), + desc_xml.reset( + static_cast(miniwget_getaddr(dev->descURL, &desc_xml_size, s_our_ip.data(), static_cast(s_our_ip.size()), 0, &statusCode))); #else - descXML.reset(static_cast(miniwget_getaddr(dev->descURL, &descXMLsize, s_our_ip.data(), - static_cast(s_our_ip.size()), 0))); + desc_xml.reset(static_cast(miniwget_getaddr( + dev->descURL, &desc_xml_size, s_our_ip.data(), static_cast(s_our_ip.size()), 0))); #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); NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL);