Index: runtime/bin/utils_macos.cc |
diff --git a/runtime/bin/utils_macos.cc b/runtime/bin/utils_macos.cc |
index 460da354a688527ddc11f39dbd9600744694ee82..c5dd68a4979916bfee430d15495fd4fe4911b434 100644 |
--- a/runtime/bin/utils_macos.cc |
+++ b/runtime/bin/utils_macos.cc |
@@ -42,38 +42,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; |
} |