| Index: runtime/bin/utils_linux.cc
|
| diff --git a/runtime/bin/utils_linux.cc b/runtime/bin/utils_linux.cc
|
| index ce35eb7ef3de667805b29f5913e3be27768e3dfb..7613db557f87b28385c83b45746b6da97d924488 100644
|
| --- a/runtime/bin/utils_linux.cc
|
| +++ b/runtime/bin/utils_linux.cc
|
| @@ -40,38 +40,58 @@ void OSError::SetCodeAndMessage(SubSystem sub_system, int code) {
|
| }
|
| }
|
|
|
| -const char* StringUtils::ConsoleStringToUtf8(const char* str) {
|
| +const char* StringUtils::ConsoleStringToUtf8(
|
| + const char* str, intptr_t len, intptr_t* result_len) {
|
| + if (result_len != NULL) {
|
| + *result_len = len;
|
| + }
|
| return str;
|
| }
|
|
|
| -const char* StringUtils::Utf8ToConsoleString(const char* utf8) {
|
| +const char* StringUtils::Utf8ToConsoleString(
|
| + const char* utf8, intptr_t len, intptr_t* result_len) {
|
| + if (result_len != NULL) {
|
| + *result_len = len;
|
| + }
|
| return utf8;
|
| }
|
|
|
| -char* StringUtils::ConsoleStringToUtf8(char* str) {
|
| +char* StringUtils::ConsoleStringToUtf8(
|
| + char* str, intptr_t len, intptr_t* result_len) {
|
| + if (result_len != NULL) {
|
| + *result_len = len;
|
| + }
|
| return str;
|
| }
|
|
|
| -char* StringUtils::Utf8ToConsoleString(char* utf8) {
|
| +char* StringUtils::Utf8ToConsoleString(
|
| + char* utf8, intptr_t len, intptr_t* result_len) {
|
| + if (result_len != NULL) {
|
| + *result_len = len;
|
| + }
|
| return utf8;
|
| }
|
|
|
| -wchar_t* StringUtils::Utf8ToWide(char* utf8) {
|
| +wchar_t* StringUtils::Utf8ToWide(
|
| + char* utf8, intptr_t len, intptr_t* result_len) {
|
| UNIMPLEMENTED();
|
| return NULL;
|
| }
|
|
|
| -const wchar_t* StringUtils::Utf8ToWide(const char* utf8) {
|
| +const wchar_t* StringUtils::Utf8ToWide(
|
| + const char* utf8, intptr_t len, intptr_t* result_len) {
|
| UNIMPLEMENTED();
|
| return NULL;
|
| }
|
|
|
| -char* StringUtils::WideToUtf8(wchar_t* str) {
|
| +char* StringUtils::WideToUtf8(
|
| + wchar_t* str, intptr_t len, intptr_t* result_len) {
|
| UNIMPLEMENTED();
|
| return NULL;
|
| }
|
|
|
| -const char* StringUtils::WideToUtf8(const wchar_t* str) {
|
| +const char* StringUtils::WideToUtf8(
|
| + const wchar_t* str, intptr_t len, intptr_t* result_len) {
|
| UNIMPLEMENTED();
|
| return NULL;
|
| }
|
|
|