DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass httpcReceiveData's return back through httpcDownloadData

Browse Source
This commit is contained in:
Ken Sanislo 2016-02-03 18:40:13 -08:00
parent 3df558e6ec
commit 5aac462be0
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libctru/source/services/httpc.c
View File

@ -1,3 +1,8 @@
//#include <stdio.h>
//#include <stdlib.h>
//#include <inttypes.h>
//#include <3ds.h>
#include <string.h> #include <string.h>
#include <3ds/types.h> #include <3ds/types.h>
#include <3ds/result.h> #include <3ds/result.h>
@ -113,6 +118,7 @@ Result httpcGetResponseStatusCode(httpcContext *context, u32* out, u64 delay)
Result httpcDownloadData(httpcContext *context, u8* buffer, u32 size, u32 *downloadedsize) Result httpcDownloadData(httpcContext *context, u8* buffer, u32 size, u32 *downloadedsize)
{ {
Result ret=0; Result ret=0;
Result dlret=HTTPC_RESULTCODE_DOWNLOADPENDING;
u32 pos=0, sz=0; u32 pos=0, sz=0;
u32 dlstartpos=0; u32 dlstartpos=0;
u32 dlpos=0; u32 dlpos=0;
@ -122,12 +128,11 @@ Result httpcDownloadData(httpcContext *context, u8* buffer, u32 size, u32 *downl
ret=httpcGetDownloadSizeState(context, &dlstartpos, NULL); ret=httpcGetDownloadSizeState(context, &dlstartpos, NULL);
if(R_FAILED(ret))return ret; if(R_FAILED(ret))return ret;
while(pos < size) while(pos < size && dlret==HTTPC_RESULTCODE_DOWNLOADPENDING)
{ {
sz = size - pos; sz = size - pos;
ret=httpcReceiveData(context, &buffer[pos], sz); dlret=httpcReceiveData(context, &buffer[pos], sz);
if(ret!=HTTPC_RESULTCODE_DOWNLOADPENDING)break;
ret=httpcGetDownloadSizeState(context, &dlpos, NULL); ret=httpcGetDownloadSizeState(context, &dlpos, NULL);
if(R_FAILED(ret))return ret; if(R_FAILED(ret))return ret;
@ -135,15 +140,9 @@ Result httpcDownloadData(httpcContext *context, u8* buffer, u32 size, u32 *downl
pos = dlpos - dlstartpos; pos = dlpos - dlstartpos;
} }
// This duplication is awful, but if I reorder the loop to avoid it
// then I get failure returns from httpcReceiveData()... wtf?
ret=httpcGetDownloadSizeState(context, &dlpos, NULL);
if(R_FAILED(ret))return ret;
pos = dlpos - dlstartpos;
if(downloadedsize)*downloadedsize = pos; if(downloadedsize)*downloadedsize = pos;
return ret; return dlret;
} }
Result HTTPC_Initialize(Handle handle) Result HTTPC_Initialize(Handle handle)