dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-06-04 16:04:59 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Human readable sdlhttprequest error messages

Browse Source
This commit is contained in:
Nathan Fulton 2016-09-01 09:36:28 -04:00
parent 4d351b8fdc
commit 22077a7328
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
game/sdl/sdlhttprequest.cpp
View File

@ -120,12 +120,25 @@ void SdlHttpRequest::CreateCurlRequest() {
void SdlHttpRequest::SubmitCurlRequest(void *pv) { void SdlHttpRequest::SubmitCurlRequest(void *pv) {
SdlHttpRequest *req = (SdlHttpRequest *)pv; SdlHttpRequest *req = (SdlHttpRequest *)pv;
// provide a buffer to store errors in
char error[CURL_ERROR_SIZE];
curl_easy_setopt(req->curl_handle_, CURLOPT_ERRORBUFFER, error);
// submit
CURLcode res = curl_easy_perform(req->curl_handle_); CURLcode res = curl_easy_perform(req->curl_handle_);
// check for errors // check for errors
if(res != CURLE_OK) { if(res != CURLE_OK) {
ErrorParams *pparams = new ErrorParams; ErrorParams *pparams = new ErrorParams;
strncpyz(pparams->szError, curl_easy_strerror(res), CURL_ERROR_SIZE);
if (strlen(error)) {
// CURLOPT_ERRORBUFFER messages should be more helpful than curl_easy_strerror
strncpyz(pparams->szError, error, CURL_ERROR_SIZE);
} else {
// Use curl_easy_strerror if CURLOPT_ERRORBUFFER not available
strncpyz(pparams->szError, curl_easy_strerror(res), CURL_ERROR_SIZE);
}
req->thread().Post(kidmError, req, pparams); req->thread().Post(kidmError, req, pparams);
} else { } else {
req->thread().Post(kidmFinishedLoading, req); req->thread().Post(kidmFinishedLoading, req);

2
game/sdl/sdlhttprequest.h
View File

@ -55,7 +55,7 @@ struct ReceivedDataParams : base::MessageData {
}; };
struct ErrorParams : base::MessageData { struct ErrorParams : base::MessageData {
char szError[80]; char szError[CURL_ERROR_SIZE];
}; };
} // namespace wi } // namespace wi