| Index: runtime/vm/os_win.cc
|
| diff --git a/runtime/vm/os_win.cc b/runtime/vm/os_win.cc
|
| index 129dcd12eaef6690b9da8b18bb22efd1d2ef085c..1134ce70c02dd1e72881bc4b0932f76c4ac92d78 100644
|
| --- a/runtime/vm/os_win.cc
|
| +++ b/runtime/vm/os_win.cc
|
| @@ -7,10 +7,10 @@
|
|
|
| #include "vm/os.h"
|
|
|
| -#include <malloc.h> // NOLINT
|
| +#include <malloc.h> // NOLINT
|
| #include <process.h> // NOLINT
|
| -#include <psapi.h> // NOLINT
|
| -#include <time.h> // NOLINT
|
| +#include <psapi.h> // NOLINT
|
| +#include <time.h> // NOLINT
|
|
|
| #include "platform/utils.h"
|
| #include "platform/assert.h"
|
| @@ -79,14 +79,12 @@ const char* OS::GetTimeZoneName(int64_t seconds_since_epoch) {
|
| }
|
|
|
| // Convert the wchar string to a null-terminated utf8 string.
|
| - wchar_t* wchar_name = daylight_savings
|
| - ? zone_information.DaylightName
|
| - : zone_information.StandardName;
|
| - intptr_t utf8_len = WideCharToMultiByte(
|
| - CP_UTF8, 0, wchar_name, -1, NULL, 0, NULL, NULL);
|
| + wchar_t* wchar_name = daylight_savings ? zone_information.DaylightName
|
| + : zone_information.StandardName;
|
| + intptr_t utf8_len =
|
| + WideCharToMultiByte(CP_UTF8, 0, wchar_name, -1, NULL, 0, NULL, NULL);
|
| char* name = Thread::Current()->zone()->Alloc<char>(utf8_len + 1);
|
| - WideCharToMultiByte(
|
| - CP_UTF8, 0, wchar_name, -1, name, utf8_len, NULL, NULL);
|
| + WideCharToMultiByte(CP_UTF8, 0, wchar_name, -1, name, utf8_len, NULL, NULL);
|
| name[utf8_len] = '\0';
|
| return name;
|
| }
|
| @@ -377,8 +375,7 @@ bool OS::StringToInt64(const char* str, int64_t* value) {
|
| if (str[0] == '-') {
|
| i = 1;
|
| }
|
| - if ((str[i] == '0') &&
|
| - (str[i + 1] == 'x' || str[i + 1] == 'X') &&
|
| + if ((str[i] == '0') && (str[i + 1] == 'x' || str[i + 1] == 'X') &&
|
| (str[i + 2] != '\0')) {
|
| base = 16;
|
| }
|
| @@ -388,8 +385,7 @@ bool OS::StringToInt64(const char* str, int64_t* value) {
|
| }
|
|
|
|
|
| -void OS::RegisterCodeObservers() {
|
| -}
|
| +void OS::RegisterCodeObservers() {}
|
|
|
|
|
| void OS::PrintErr(const char* format, ...) {
|
|
|