From 986fe4a93dc979b341a8f95098407ea362ed7b65 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:58:33 +0200 Subject: [PATCH] Tier2: rename curl params field name 'cust' -> 'user'. --- src/public/tier2/curlutils.h | 8 ++++---- src/tier2/curlutils.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/public/tier2/curlutils.h b/src/public/tier2/curlutils.h index e74c628e..2948d694 100644 --- a/src/public/tier2/curlutils.h +++ b/src/public/tier2/curlutils.h @@ -6,13 +6,13 @@ struct CURLProgress CURLProgress() : curl(nullptr) , name(nullptr) - , cust(nullptr) + , user(nullptr) , size(0) {} CURL* curl; const char* name; - void* cust; // custom pointer to anything, todo(amos): rename to 'user'. + void* user; // custom pointer to anything. size_t size; }; @@ -47,9 +47,9 @@ size_t CURLWriteStringCallback(char* contents, const size_t size, const size_t n curl_slist* CURLSlistAppend(curl_slist* slist, const char* string); bool CURLUploadFile(const char* remote, const char* filePath, const char* options, - void* customPointer, const bool usePost, const curl_slist* slist, const CURLParams& params); + void* userData, const bool usePost, const curl_slist* slist, const CURLParams& params); bool CURLDownloadFile(const char* remote, const char* savePath, const char* fileName, - const char* options, curl_off_t dataSize, void* customPointer, const CURLParams& params); + const char* options, curl_off_t dataSize, void* userData, const CURLParams& params); CURL* CURLInitRequest(const char* remote, const char* request, string& outResponse, curl_slist*& slist, const CURLParams& params); diff --git a/src/tier2/curlutils.cpp b/src/tier2/curlutils.cpp index 0fa74a9b..17eea068 100644 --- a/src/tier2/curlutils.cpp +++ b/src/tier2/curlutils.cpp @@ -97,7 +97,7 @@ curl_slist* CURLSlistAppend(curl_slist* slist, const char* string) } bool CURLUploadFile(const char* remote, const char* filePath, - const char* options, void* customPointer, const bool usePost, + const char* options, void* userData, const bool usePost, const curl_slist* slist, const CURLParams& params) { CURL* curl = EasyInit(); @@ -123,7 +123,7 @@ bool CURLUploadFile(const char* remote, const char* filePath, progressData.curl = curl; progressData.name = filePath; - progressData.cust = customPointer; + progressData.user = userData; progressData.size = fileStatus.st_size; string response; @@ -172,7 +172,7 @@ bool CURLUploadFile(const char* remote, const char* filePath, } bool CURLDownloadFile(const char* remote, const char* savePath, const char* fileName, - const char* options, curl_off_t dataSize, void* customPointer, const CURLParams& params) + const char* options, curl_off_t dataSize, void* userData, const CURLParams& params) { CURL* curl = EasyInit(); if (!curl) @@ -196,7 +196,7 @@ bool CURLDownloadFile(const char* remote, const char* savePath, const char* file progressData.curl = curl; progressData.name = fileName; - progressData.cust = customPointer; + progressData.user = userData; progressData.size = dataSize; CURLInitCommonOptions(curl, remote, nullptr, file, params, &progressData);