blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-04-06 03:58:02 +08:00
Code Issues Projects Releases Wiki Activity

Move running check to xfer info callback.

Browse Source
This commit is contained in:
Steveice10 2019-01-01 11:27:46 -08:00
parent 2a223f08aa
commit 9aeac8294d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/core/http.c
View File

@ -287,10 +287,6 @@ typedef struct {
static size_t http_curl_write_callback(char* ptr, size_t size, size_t nmemb, void* userdata) { static size_t http_curl_write_callback(char* ptr, size_t size, size_t nmemb, void* userdata) {
http_curl_data* curlData = (http_curl_data*) userdata; http_curl_data* curlData = (http_curl_data*) userdata;
if(curlData->checkRunning != NULL && R_FAILED(curlData->res = curlData->checkRunning(curlData->userData))) {
return 0;
}
size_t srcPos = 0; size_t srcPos = 0;
size_t available = size * nmemb; size_t available = size * nmemb;
while(available > 0) { while(available > 0) {
@ -315,8 +311,12 @@ static size_t http_curl_write_callback(char* ptr, size_t size, size_t nmemb, voi
int http_curl_xfer_info_callback(void* clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) { int http_curl_xfer_info_callback(void* clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) {
http_curl_data* curlData = (http_curl_data*) clientp; http_curl_data* curlData = (http_curl_data*) clientp;
if(curlData->checkRunning != NULL && R_FAILED(curlData->res = curlData->checkRunning(curlData->userData))) {
return 0;
}
if(curlData->progress != NULL) { if(curlData->progress != NULL) {
curlData->progress(curlData->userData, dltotal, dlnow); curlData->progress(curlData->userData, (u64) dltotal, (u64) dlnow);
} }
return 0; return 0;