kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make cURL use Bytes instead of Strings

Browse Source
This commit is contained in:
Joshua Granick
2015-09-21 16:46:16 -07:00
parent 90ef7cedea
commit d287d64af6
3 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
project/src/net/curl/CURLBindings.cpp
View File

@@ -1,5 +1,6 @@
#include <curl/curl.h>
#include <hx/CFFIPrime.h>
#include <utils/Bytes.h>
#include <string.h>
@@ -173,8 +174,10 @@ namespace lime {
}
value str = alloc_string_len ((const char*)ptr, size * nmemb);
return val_int (val_call3 (callback->get (), str, alloc_int (size), alloc_int (nmemb)));
Bytes bytes = Bytes (size * nmemb);
memcpy (bytes.Data (), ptr, size * nmemb);
return val_int (val_call3 (callback->get (), bytes.Value (), alloc_int (size), alloc_int (nmemb)));
}
@@ -183,15 +186,14 @@ namespace lime {
AutoGCRoot* callback = (AutoGCRoot*)userp;
size_t bytes = size * nmemb;
const char *input = val_string (val_call1 (callback->get (), alloc_int (bytes)));
size_t length = strlen (input);
size_t length = size * nmemb;
Bytes bytes = Bytes (val_call1 (callback->get (), alloc_int (length)));
if (length <= bytes) bytes = length;
if (bytes.Length () <= length) length = bytes.Length ();
memcpy (buffer, input, bytes);
memcpy (buffer, bytes.Data (), length);
return bytes;
return length;
}