authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-18 10:17:48-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-18 10:17:48-04:00
log93ff5024a4186d0067df969d403d311ac978996c
tree54450155cf18a7aaf1ae857528892276c0b4a3f8
parentd353d5aef8bfc5c701ab8958751ef74f6704342b
signaturelock-open Commit is signed but in an unrecognized format.

minor cleanups from 68c1d05917

1 files changed, 1 insertions(+), 3 deletions(-)

src/os.cpp+1-3
...@@ -1722,7 +1722,6 @@ static void utf16le_ptr_to_utf8(Buf *out, WCHAR *utf16le) {...@@ -1722,7 +1722,6 @@ static void utf16le_ptr_to_utf8(Buf *out, WCHAR *utf16le) {
1722// Ported from std.os.getAppDataDir1722// Ported from std.os.getAppDataDir
1723Error os_get_app_data_dir(Buf *out_path, const char *appname) {1723Error os_get_app_data_dir(Buf *out_path, const char *appname) {
1724#if defined(ZIG_OS_WINDOWS)1724#if defined(ZIG_OS_WINDOWS)
1725 // Error err;
1726 WCHAR *dir_path_ptr;1725 WCHAR *dir_path_ptr;
1727 switch (SHGetKnownFolderPath(FOLDERID_LocalAppData, KF_FLAG_CREATE, nullptr, &dir_path_ptr)) {1726 switch (SHGetKnownFolderPath(FOLDERID_LocalAppData, KF_FLAG_CREATE, nullptr, &dir_path_ptr)) {
1728 case S_OK:1727 case S_OK:
...@@ -1936,7 +1935,6 @@ Error os_file_mtime(OsFile file, OsTimeStamp *mtime) {...@@ -1936,7 +1935,6 @@ Error os_file_mtime(OsFile file, OsTimeStamp *mtime) {
1936 FILETIME last_write_time;1935 FILETIME last_write_time;
1937 if (!GetFileTime(file, nullptr, nullptr, &last_write_time))1936 if (!GetFileTime(file, nullptr, nullptr, &last_write_time))
1938 return ErrorUnexpected;1937 return ErrorUnexpected;
1939 // mtime->sec = last_write_time.dwLowDateTime | (last_write_time.dwHighDateTime << 32);
1940 mtime->sec = (((ULONGLONG) last_write_time.dwHighDateTime) << 32) + last_write_time.dwLowDateTime;1938 mtime->sec = (((ULONGLONG) last_write_time.dwHighDateTime) << 32) + last_write_time.dwLowDateTime;
1941 mtime->nsec = 0;1939 mtime->nsec = 0;
1942 return ErrorNone;1940 return ErrorNone;
...@@ -2016,11 +2014,11 @@ Error os_file_read_all(OsFile file, Buf *contents) {...@@ -2016,11 +2014,11 @@ Error os_file_read_all(OsFile file, Buf *contents) {
20162014
2017Error os_file_overwrite(OsFile file, Buf *contents) {2015Error os_file_overwrite(OsFile file, Buf *contents) {
2018#if defined(ZIG_OS_WINDOWS)2016#if defined(ZIG_OS_WINDOWS)
2019 DWORD bytes_written;
2020 if (SetFilePointer(file, 0, nullptr, FILE_BEGIN) == INVALID_SET_FILE_POINTER)2017 if (SetFilePointer(file, 0, nullptr, FILE_BEGIN) == INVALID_SET_FILE_POINTER)
2021 return ErrorFileSystem;2018 return ErrorFileSystem;
2022 if (!SetEndOfFile(file))2019 if (!SetEndOfFile(file))
2023 return ErrorFileSystem;2020 return ErrorFileSystem;
2021 DWORD bytes_written;
2024 if (!WriteFile(file, buf_ptr(contents), buf_len(contents), &bytes_written, nullptr))2022 if (!WriteFile(file, buf_ptr(contents), buf_len(contents), &bytes_written, nullptr))
2025 return ErrorFileSystem;2023 return ErrorFileSystem;
2026 return ErrorNone;2024 return ErrorNone;