From 0c5a24152e3e603d010275e859cd762b65664dbb Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sun, 2 Apr 2023 17:40:15 +0200 Subject: [PATCH] /W4: Fix name shadowing warnings Parameter 'hostname' shadows global cvar 'hostname'. --- r5dev/tier2/curlutils.cpp | 4 ++-- r5dev/tier2/curlutils.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/r5dev/tier2/curlutils.cpp b/r5dev/tier2/curlutils.cpp index 94a14645..fdef7630 100644 --- a/r5dev/tier2/curlutils.cpp +++ b/r5dev/tier2/curlutils.cpp @@ -13,7 +13,7 @@ size_t CURLWriteStringCallback(char* contents, size_t size, size_t nmemb, void* return size * nmemb; } -CURL* CURLInitRequest(const string& hostname, const string& request, string& response, curl_slist*& slist) +CURL* CURLInitRequest(const string& remote, const string& request, string& response, curl_slist*& slist) { std::function fnError = [&](const char* errorMsg) { @@ -36,7 +36,7 @@ CURL* CURLInitRequest(const string& hostname, const string& request, string& res } curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist); - curl_easy_setopt(curl, CURLOPT_URL, hostname.c_str()); + curl_easy_setopt(curl, CURLOPT_URL, remote.c_str()); curl_easy_setopt(curl, CURLOPT_POSTFIELDS, request.c_str()); curl_easy_setopt(curl, CURLOPT_POST, 1L); curl_easy_setopt(curl, CURLOPT_TIMEOUT, curl_timeout->GetInt()); diff --git a/r5dev/tier2/curlutils.h b/r5dev/tier2/curlutils.h index b83978a4..a53aab83 100644 --- a/r5dev/tier2/curlutils.h +++ b/r5dev/tier2/curlutils.h @@ -3,7 +3,7 @@ size_t CURLWriteStringCallback(char* contents, size_t size, size_t nmemb, void* userp); -CURL* CURLInitRequest(const string& hostname, const string& request, string& response, curl_slist*& slist); +CURL* CURLInitRequest(const string& remote, const string& request, string& response, curl_slist*& slist); CURLcode CURLSubmitRequest(CURL* curl, curl_slist*& slist); CURLINFO CURLRetrieveInfo(CURL* curl);