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

Reduce HTTP code duplication.

Browse Source
This commit is contained in:
Steveice10 2016-12-22 17:40:30 -08:00
parent a5120e0981
commit d4d0aca13d
8 changed files with 179 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
source/core/util.c
View File

@ -291,9 +291,7 @@ static Result FSUSER_AddSeed(u64 titleId, const void* seed) {
return ret; return ret;
} }
static u32 import_response_code = 0; Result util_import_seed(u32* responseCode, u64 titleId) {
Result util_import_seed(u64 titleId) {
char pathBuf[64]; char pathBuf[64];
snprintf(pathBuf, 64, "/fbi/seed/%016llX.dat", titleId); snprintf(pathBuf, 64, "/fbi/seed/%016llX.dat", titleId);
@ -324,17 +322,14 @@ Result util_import_seed(u64 titleId) {
snprintf(url, 128, "https://kagiya-ctr.cdn.nintendo.net/title/0x%016llX/ext_key?country=%s", titleId, regionStrings[region]); snprintf(url, 128, "https://kagiya-ctr.cdn.nintendo.net/title/0x%016llX/ext_key?country=%s", titleId, regionStrings[region]);
httpcContext context; httpcContext context;
if(R_SUCCEEDED(res = httpcOpenContext(&context, HTTPC_METHOD_GET, url, 1))) { if(R_SUCCEEDED(res = util_http_open(&context, responseCode, url, false))) {
if(R_SUCCEEDED(res = httpcSetSSLOpt(&context, SSLCOPT_DisableVerify)) && R_SUCCEEDED(res = httpcBeginRequest(&context)) && R_SUCCEEDED(res = httpcGetResponseStatusCode(&context, &import_response_code))) {
if(import_response_code == 200) {
u32 bytesRead = 0; u32 bytesRead = 0;
res = httpcDownloadData(&context, seed, sizeof(seed), &bytesRead); res = util_http_read(&context, &bytesRead, seed, sizeof(seed));
} else {
res = R_FBI_HTTP_RESPONSE_CODE;
}
}
httpcCloseContext(&context); Result closeRes = util_http_close(&context);
if(R_SUCCEEDED(res)) {
res = closeRes;
}
} }
} else { } else {
res = R_FBI_OUT_OF_RANGE; res = R_FBI_OUT_OF_RANGE;
@ -351,10 +346,6 @@ Result util_import_seed(u64 titleId) {
return res; return res;
} }
u32 util_get_seed_response_code() {
return import_response_code;
}
FS_MediaType util_get_title_destination(u64 titleId) { FS_MediaType util_get_title_destination(u64 titleId) {
u16 platform = (u16) ((titleId >> 48) & 0xFFFF); u16 platform = (u16) ((titleId >> 48) & 0xFFFF);
u16 category = (u16) ((titleId >> 32) & 0xFFFF); u16 category = (u16) ((titleId >> 32) & 0xFFFF);
@ -648,3 +639,80 @@ void util_smdh_region_to_string(char* out, u32 region, size_t size) {
} }
} }
} }
static char util_http_redirect_buffer[1024];
Result util_http_open(httpcContext* context, u32* responseCode, const char* url, bool userAgent) {
return util_http_open_ranged(context, responseCode, url, userAgent, 0, 0);
}
Result util_http_open_ranged(httpcContext* context, u32* responseCode, const char* url, bool userAgent, u32 rangeStart, u32 rangeEnd) {
if(context == NULL || url == NULL) {
return R_FBI_INVALID_ARGUMENT;
}
Result res = 0;
if(R_SUCCEEDED(res = httpcOpenContext(context, HTTPC_METHOD_GET, url, 1))) {
char agent[128];
snprintf(agent, sizeof(agent), "Mozilla/5.0 (Nintendo 3DS; Mobile; rv:10.0) Gecko/20100101 FBI/%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
char range[64];
if(rangeEnd > rangeStart) {
snprintf(range, sizeof(range), "%lu-%lu", rangeStart, rangeEnd);
} else {
snprintf(range, sizeof(range), "%lu-", rangeStart);
}
u32 response = 0;
if(R_SUCCEEDED(res = httpcSetSSLOpt(context, SSLCOPT_DisableVerify)) && (!userAgent || R_SUCCEEDED(res = httpcAddRequestHeaderField(context, "User-Agent", agent))) && (rangeStart == 0 || R_SUCCEEDED(res = httpcAddRequestHeaderField(context, "Range", range))) && R_SUCCEEDED(res = httpcSetKeepAlive(context, HTTPC_KEEPALIVE_ENABLED)) && R_SUCCEEDED(res = httpcBeginRequest(context)) && R_SUCCEEDED(res = httpcGetResponseStatusCode(context, &response))) {
if(response == 301 || response == 302 || response == 303) {
memset(util_http_redirect_buffer, '\0', sizeof(util_http_redirect_buffer));
if(R_SUCCEEDED(res = httpcGetResponseHeader(context, "Location", util_http_redirect_buffer, sizeof(util_http_redirect_buffer)))) {
httpcCloseContext(context);
return util_http_open_ranged(context, responseCode, util_http_redirect_buffer, userAgent, rangeStart, rangeEnd);
}
} else {
if(responseCode != NULL) {
*responseCode = response;
}
if(response != 200) {
res = R_FBI_HTTP_RESPONSE_CODE;
}
}
}
if(R_FAILED(res)) {
httpcCloseContext(context);
}
}
return res;
}
Result util_http_get_size(httpcContext* context, u32* size) {
if(context == NULL || size == NULL) {
return R_FBI_INVALID_ARGUMENT;
}
return httpcGetDownloadSizeState(context, NULL, size);
}
Result util_http_read(httpcContext* context, u32* bytesRead, void* buffer, u32 size) {
if(context == NULL || buffer == NULL) {
return R_FBI_INVALID_ARGUMENT;
}
Result res = httpcDownloadData(context, buffer, size, bytesRead);
return res != HTTPC_RESULTCODE_DOWNLOADPENDING ? res : 0;
}
Result util_http_close(httpcContext* context) {
if(context == NULL) {
return R_FBI_INVALID_ARGUMENT;
}
return httpcCloseContext(context);
}

9
source/core/util.h
View File

@ -55,8 +55,7 @@ void util_get_parent_path(char* out, const char* path, u32 size);
bool util_is_string_empty(const char* str); bool util_is_string_empty(const char* str);
Result util_import_seed(u64 titleId); Result util_import_seed(u32* responseCode, u64 titleId);
u32 util_get_seed_response_code();
FS_MediaType util_get_title_destination(u64 titleId); FS_MediaType util_get_title_destination(u64 titleId);
@ -85,3 +84,9 @@ const char* util_get_display_size_units(u64 size);
void util_escape_file_name(char* out, const char* in, size_t size); void util_escape_file_name(char* out, const char* in, size_t size);
void util_smdh_region_to_string(char* out, u32 region, size_t size); void util_smdh_region_to_string(char* out, u32 region, size_t size);
Result util_http_open(httpcContext* context, u32* responseCode, const char* url, bool userAgent);
Result util_http_open_ranged(httpcContext* context, u32* responseCode, const char* url, bool userAgent, u32 rangeStart, u32 rangeEnd);
Result util_http_get_size(httpcContext* context, u32* size);
Result util_http_read(httpcContext* context, u32* bytesRead, void* buffer, u32 size);
Result util_http_close(httpcContext* context);

5
source/ui/section/action/importseed.c
View File

@ -16,7 +16,8 @@
static void action_import_seed_update(ui_view* view, void* data, float* progress, char* text) { static void action_import_seed_update(ui_view* view, void* data, float* progress, char* text) {
title_info* info = (title_info*) data; title_info* info = (title_info*) data;
Result res = util_import_seed(info->titleId); u32 responseCode = 0;
Result res = util_import_seed(&responseCode, info->titleId);
ui_pop(); ui_pop();
info_destroy(view); info_destroy(view);
@ -24,7 +25,7 @@ static void action_import_seed_update(ui_view* view, void* data, float* progress
if(R_SUCCEEDED(res)) { if(R_SUCCEEDED(res)) {
prompt_display("Success", "Seed imported.", COLOR_TEXT, false, info, ui_draw_title_info, NULL); prompt_display("Success", "Seed imported.", COLOR_TEXT, false, info, ui_draw_title_info, NULL);
} else if(res == R_FBI_HTTP_RESPONSE_CODE) { } else if(res == R_FBI_HTTP_RESPONSE_CODE) {
error_display(NULL, NULL, "Failed to import seed.\nHTTP server returned response code %d", util_get_seed_response_code()); error_display(NULL, NULL, "Failed to import seed.\nHTTP server returned response code %d", responseCode);
} else { } else {
error_display_res(info, ui_draw_title_info, res, "Failed to import seed."); error_display_res(info, ui_draw_title_info, res, "Failed to import seed.");
} }

23
source/ui/section/action/installcdn.c
View File

@ -59,21 +59,9 @@ static Result action_install_cdn_open_src(void* data, u32 index, u32* handle) {
snprintf(url, 256, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/%016llX/%08lX", installData->ticket->titleId, installData->contentIds[index - 1]); snprintf(url, 256, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/%016llX/%08lX", installData->ticket->titleId, installData->contentIds[index - 1]);
} }
if(R_SUCCEEDED(res = httpcOpenContext(context, HTTPC_METHOD_GET, url, 1))) { if(R_SUCCEEDED(res = util_http_open(context, &installData->responseCode, url, false))) {
if(R_SUCCEEDED(res = httpcSetSSLOpt(context, SSLCOPT_DisableVerify)) && R_SUCCEEDED(res = httpcBeginRequest(context)) && R_SUCCEEDED(res = httpcGetResponseStatusCode(context, &installData->responseCode))) {
if(installData->responseCode == 200) {
*handle = (u32) context; *handle = (u32) context;
} else { } else {
res = R_FBI_HTTP_RESPONSE_CODE;
}
}
if(R_FAILED(res)) {
httpcCloseContext(context);
}
}
if(R_FAILED(res)) {
free(context); free(context);
} }
} else { } else {
@ -84,20 +72,19 @@ static Result action_install_cdn_open_src(void* data, u32 index, u32* handle) {
} }
static Result action_install_cdn_close_src(void* data, u32 index, bool succeeded, u32 handle) { static Result action_install_cdn_close_src(void* data, u32 index, bool succeeded, u32 handle) {
return httpcCloseContext((httpcContext*) handle); return util_http_close((httpcContext*) handle);
} }
static Result action_install_cdn_get_src_size(void* data, u32 handle, u64* size) { static Result action_install_cdn_get_src_size(void* data, u32 handle, u64* size) {
u32 downloadSize = 0; u32 downloadSize = 0;
Result res = httpcGetDownloadSizeState((httpcContext*) handle, NULL, &downloadSize); Result res = util_http_get_size((httpcContext*) handle, &downloadSize);
*size = downloadSize; *size = downloadSize;
return res; return res;
} }
static Result action_install_cdn_read_src(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size) { static Result action_install_cdn_read_src(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size) {
Result res = httpcDownloadData((httpcContext*) handle, buffer, size, bytesRead); return util_http_read((httpcContext*) handle, bytesRead, buffer, size);
return res != HTTPC_RESULTCODE_DOWNLOADPENDING ? res : 0;
} }
static Result action_install_cdn_open_dst(void* data, u32 index, void* initialReadBlock, u64 size, u32* handle) { static Result action_install_cdn_open_dst(void* data, u32 index, void* initialReadBlock, u64 size, u32* handle) {
@ -222,7 +209,7 @@ static void action_install_cdn_update(ui_view* view, void* data, float* progress
if(R_SUCCEEDED(installData->installInfo.result)) { if(R_SUCCEEDED(installData->installInfo.result)) {
if(R_SUCCEEDED(res = AM_InstallTitleFinish()) if(R_SUCCEEDED(res = AM_InstallTitleFinish())
&& R_SUCCEEDED(res = AM_CommitImportTitles(util_get_title_destination(installData->ticket->titleId), 1, false, &installData->ticket->titleId))) { && R_SUCCEEDED(res = AM_CommitImportTitles(util_get_title_destination(installData->ticket->titleId), 1, false, &installData->ticket->titleId))) {
util_import_seed(installData->ticket->titleId); util_import_seed(NULL, installData->ticket->titleId);
if(installData->ticket->titleId == 0x0004013800000002 || installData->ticket->titleId == 0x0004013820000002) { if(installData->ticket->titleId == 0x0004013800000002 || installData->ticket->titleId == 0x0004013820000002) {
res = AM_InstallFirm(installData->ticket->titleId); res = AM_InstallFirm(installData->ticket->titleId);

2
source/ui/section/action/installcias.c
View File

@ -160,7 +160,7 @@ static Result action_install_cias_close_dst(void* data, u32 index, bool succeede
Result res = 0; Result res = 0;
if(R_SUCCEEDED(res = AM_FinishCiaInstall(handle))) { if(R_SUCCEEDED(res = AM_FinishCiaInstall(handle))) {
util_import_seed(installData->currTitleId); util_import_seed(NULL, installData->currTitleId);
if(installData->currTitleId == 0x0004013800000002 || installData->currTitleId == 0x0004013820000002) { if(installData->currTitleId == 0x0004013800000002 || installData->currTitleId == 0x0004013820000002) {
res = AM_InstallFirm(installData->currTitleId); res = AM_InstallFirm(installData->currTitleId);

34
source/ui/section/action/urlinstall.c
View File

@ -58,32 +58,9 @@ static Result action_url_install_open_src(void* data, u32 index, u32* handle) {
httpcContext* context = (httpcContext*) calloc(1, sizeof(httpcContext)); httpcContext* context = (httpcContext*) calloc(1, sizeof(httpcContext));
if(context != NULL) { if(context != NULL) {
if(R_SUCCEEDED(res = httpcOpenContext(context, HTTPC_METHOD_GET, installData->urls[index], 1))) { if(R_SUCCEEDED(res = util_http_open(context, &installData->responseCode, installData->urls[index], true))) {
char userAgent[128];
snprintf(userAgent, sizeof(userAgent), "Mozilla/5.0 (Nintendo 3DS; Mobile; rv:10.0) Gecko/20100101 FBI/%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
if(R_SUCCEEDED(res = httpcSetSSLOpt(context, SSLCOPT_DisableVerify)) && R_SUCCEEDED(res = httpcAddRequestHeaderField(context, "User-Agent", userAgent)) && R_SUCCEEDED(res = httpcBeginRequest(context)) && R_SUCCEEDED(res = httpcGetResponseStatusCode(context, &installData->responseCode))) {
if(installData->responseCode == 200) {
*handle = (u32) context; *handle = (u32) context;
} else if(installData->responseCode == 301 || installData->responseCode == 302 || installData->responseCode == 303) {
memset(installData->urls[index], '\0', URL_MAX);
if(R_SUCCEEDED(res = httpcGetResponseHeader(context, "Location", installData->urls[index], URL_MAX))) {
httpcCloseContext(context);
free(context);
return action_url_install_open_src(data, index, handle);
}
} else { } else {
res = R_FBI_HTTP_RESPONSE_CODE;
}
}
if(R_FAILED(res)) {
httpcCloseContext(context);
}
}
if(R_FAILED(res)) {
free(context); free(context);
} }
} else { } else {
@ -94,20 +71,19 @@ static Result action_url_install_open_src(void* data, u32 index, u32* handle) {
} }
static Result action_url_install_close_src(void* data, u32 index, bool succeeded, u32 handle) { static Result action_url_install_close_src(void* data, u32 index, bool succeeded, u32 handle) {
return httpcCloseContext((httpcContext*) handle); return util_http_close((httpcContext*) handle);
} }
static Result action_url_install_get_src_size(void* data, u32 handle, u64* size) { static Result action_url_install_get_src_size(void* data, u32 handle, u64* size) {
u32 downloadSize = 0; u32 downloadSize = 0;
Result res = httpcGetDownloadSizeState((httpcContext*) handle, NULL, &downloadSize); Result res = util_http_get_size((httpcContext*) handle, &downloadSize);
*size = downloadSize; *size = downloadSize;
return res; return res;
} }
static Result action_url_install_read_src(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size) { static Result action_url_install_read_src(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size) {
Result res = httpcDownloadData((httpcContext*) handle, buffer, size, bytesRead); return util_http_read((httpcContext*) handle, bytesRead, buffer, size);
return res != HTTPC_RESULTCODE_DOWNLOADPENDING ? res : 0;
} }
static Result action_url_install_open_dst(void* data, u32 index, void* initialReadBlock, u64 size, u32* handle) { static Result action_url_install_open_dst(void* data, u32 index, void* initialReadBlock, u64 size, u32* handle) {
@ -190,7 +166,7 @@ static Result action_url_install_close_dst(void* data, u32 index, bool succeeded
} }
} else { } else {
if(R_SUCCEEDED(res = AM_FinishCiaInstall(handle))) { if(R_SUCCEEDED(res = AM_FinishCiaInstall(handle))) {
util_import_seed(installData->currTitleId); util_import_seed(NULL, installData->currTitleId);
if(installData->currTitleId == 0x0004013800000002 || installData->currTitleId == 0x0004013820000002) { if(installData->currTitleId == 0x0004013800000002 || installData->currTitleId == 0x0004013820000002) {
res = AM_InstallFirm(installData->currTitleId); res = AM_InstallFirm(installData->currTitleId);

35
source/ui/section/task/listtitledb.c
View File

@ -17,39 +17,14 @@
static Result task_populate_titledb_download(u32* downloadSize, void* buffer, u32 maxSize, const char* url) { static Result task_populate_titledb_download(u32* downloadSize, void* buffer, u32 maxSize, const char* url) {
Result res = 0; Result res = 0;
if(downloadSize != NULL) {
*downloadSize = 0;
}
httpcContext context; httpcContext context;
if(R_SUCCEEDED(res = httpcOpenContext(&context, HTTPC_METHOD_GET, url, 1))) { if(R_SUCCEEDED(res = util_http_open(&context, NULL, url, true))) {
char userAgent[128]; res = util_http_read(&context, downloadSize, buffer, maxSize);
snprintf(userAgent, sizeof(userAgent), "Mozilla/5.0 (Nintendo 3DS; Mobile; rv:10.0) Gecko/20100101 FBI/%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
u32 responseCode = 0; Result closeRes = util_http_close(&context);
if(R_SUCCEEDED(res = httpcSetSSLOpt(&context, SSLCOPT_DisableVerify)) if(R_SUCCEEDED(res)) {
&& R_SUCCEEDED(res = httpcAddRequestHeaderField(&context, "User-Agent", userAgent)) res = closeRes;
&& R_SUCCEEDED(res = httpcAddRequestHeaderField(&context, "Connection", "Keep-Alive"))
&& R_SUCCEEDED(res = httpcBeginRequest(&context))
&& R_SUCCEEDED(res = httpcGetResponseStatusCode(&context, &responseCode))) {
if(responseCode == 200) {
u32 size = 0;
u32 bytesRead = 0;
while(size < maxSize && (res = httpcDownloadData(&context, &((u8*) buffer)[size], maxSize - size < 0x1000 ? maxSize - size : 0x1000, &bytesRead)) == HTTPC_RESULTCODE_DOWNLOADPENDING) {
size += bytesRead;
} }
size += bytesRead;
if(R_SUCCEEDED(res) && downloadSize != NULL) {
*downloadSize = size;
}
} else {
res = R_FBI_HTTP_RESPONSE_CODE;
}
}
httpcCloseContext(&context);
} }
return res; return res;

51
source/ui/section/update.c
View File

@ -39,28 +39,9 @@ static Result update_open_src(void* data, u32 index, u32* handle) {
httpcContext* context = (httpcContext*) calloc(1, sizeof(httpcContext)); httpcContext* context = (httpcContext*) calloc(1, sizeof(httpcContext));
if(context != NULL) { if(context != NULL) {
if(R_SUCCEEDED(res = httpcOpenContext(context, HTTPC_METHOD_GET, updateData->url, 1))) { if(R_SUCCEEDED(res = util_http_open(context, &updateData->responseCode, updateData->url, true))) {
if(R_SUCCEEDED(res = httpcSetSSLOpt(context, SSLCOPT_DisableVerify)) && R_SUCCEEDED(res = httpcBeginRequest(context)) && R_SUCCEEDED(res = httpcGetResponseStatusCode(context, &updateData->responseCode))) {
if(updateData->responseCode == 200) {
*handle = (u32) context; *handle = (u32) context;
} else if(updateData->responseCode == 301 || updateData->responseCode == 302 || updateData->responseCode == 303) {
if(R_SUCCEEDED(res = httpcGetResponseHeader(context, "Location", updateData->url, URL_MAX))) {
httpcCloseContext(context);
free(context);
return update_open_src(data, index, handle);
}
} else { } else {
res = R_FBI_HTTP_RESPONSE_CODE;
}
}
if(R_FAILED(res)) {
httpcCloseContext(context);
}
}
if(R_FAILED(res)) {
free(context); free(context);
} }
} else { } else {
@ -71,20 +52,19 @@ static Result update_open_src(void* data, u32 index, u32* handle) {
} }
static Result update_close_src(void* data, u32 index, bool succeeded, u32 handle) { static Result update_close_src(void* data, u32 index, bool succeeded, u32 handle) {
return httpcCloseContext((httpcContext*) handle); return util_http_close((httpcContext*) handle);
} }
static Result update_get_src_size(void* data, u32 handle, u64* size) { static Result update_get_src_size(void* data, u32 handle, u64* size) {
u32 downloadSize = 0; u32 downloadSize = 0;
Result res = httpcGetDownloadSizeState((httpcContext*) handle, NULL, &downloadSize); Result res = util_http_get_size((httpcContext*) handle, &downloadSize);
*size = downloadSize; *size = downloadSize;
return res; return res;
} }
static Result update_read_src(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size) { static Result update_read_src(void* data, u32 handle, u32* bytesRead, void* buffer, u64 offset, u32 size) {
Result res = httpcDownloadData((httpcContext*) handle, buffer, size, bytesRead); return util_http_read((httpcContext*) handle, bytesRead, buffer, size);
return res != HTTPC_RESULTCODE_DOWNLOADPENDING ? res : 0;
} }
static Result update_open_dst(void* data, u32 index, void* initialReadBlock, u64 size, u32* handle) { static Result update_open_dst(void* data, u32 index, void* initialReadBlock, u64 size, u32* handle) {
@ -183,21 +163,13 @@ static void update_check_update(ui_view* view, void* data, float* progress, char
u32 responseCode = 0; u32 responseCode = 0;
httpcContext context; httpcContext context;
if(R_SUCCEEDED(res = httpcOpenContext(&context, HTTPC_METHOD_GET, "https://api.github.com/repos/Steveice10/FBI/releases/latest", 1))) { if(R_SUCCEEDED(res = util_http_open(&context, &responseCode, "https://api.github.com/repos/Steveice10/FBI/releases/latest", true))) {
char userAgent[128];
snprintf(userAgent, sizeof(userAgent), "Mozilla/5.0 (Nintendo 3DS; Mobile; rv:10.0) Gecko/20100101 FBI/%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
if(R_SUCCEEDED(res = httpcSetSSLOpt(&context, SSLCOPT_DisableVerify))
&& R_SUCCEEDED(res = httpcAddRequestHeaderField(&context, "User-Agent", userAgent))
&& R_SUCCEEDED(res = httpcBeginRequest(&context))
&& R_SUCCEEDED(res = httpcGetResponseStatusCode(&context, &responseCode))) {
if(responseCode == 200) {
u32 size = 0; u32 size = 0;
if(R_SUCCEEDED(res = httpcGetDownloadSizeState(&context, NULL, &size))) { if(R_SUCCEEDED(res = util_http_get_size(&context, &size))) {
char* jsonText = (char*) calloc(sizeof(char), size); char* jsonText = (char*) calloc(sizeof(char), size);
if(jsonText != NULL) { if(jsonText != NULL) {
u32 bytesRead = 0; u32 bytesRead = 0;
if(R_SUCCEEDED(res = httpcDownloadData(&context, (u8*) jsonText, size, &bytesRead))) { if(R_SUCCEEDED(res = util_http_read(&context, &bytesRead, (u8*) jsonText, size))) {
json_value* json = json_parse(jsonText, size); json_value* json = json_parse(jsonText, size);
if(json != NULL) { if(json != NULL) {
if(json->type == json_object) { if(json->type == json_object) {
@ -267,12 +239,11 @@ static void update_check_update(ui_view* view, void* data, float* progress, char
res = R_FBI_OUT_OF_MEMORY; res = R_FBI_OUT_OF_MEMORY;
} }
} }
} else {
res = R_FBI_HTTP_RESPONSE_CODE;
}
}
httpcCloseContext(&context); Result closeRes = util_http_close(&context);
if(R_SUCCEEDED(res)) {
res = closeRes;
}
} }
ui_pop(); ui_pop();