Skip to content

Commit

Permalink
FileAccessWindows: Cosmetic improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
mhilbrunner committed Aug 9, 2021
1 parent b48cbb5 commit a5c179e
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/windows/file_access_windows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ Error FileAccessWindows::_open(const String &p_path, int p_mode_flags) {
return ERR_INVALID_PARAMETER;
}

/* pretty much every implementation that uses fopen as primary
backend supports utf8 encoding */
/* Pretty much every implementation that uses fopen as primary
backend supports utf8 encoding. */

struct _stat st;
if (_wstat((LPCWSTR)(path.utf16().get_data()), &st) == 0) {
Expand Down Expand Up @@ -157,10 +157,10 @@ void FileAccessWindows::close() {
#else
if (!PathFileExistsW((LPCWSTR)(save_path.utf16().get_data()))) {
#endif
//creating new file
// Creating new file
rename_error = _wrename((LPCWSTR)((save_path + ".tmp").utf16().get_data()), (LPCWSTR)(save_path.utf16().get_data())) != 0;
} else {
//atomic replace for existing file
// Atomic replace for existing file
rename_error = !ReplaceFileW((LPCWSTR)(save_path.utf16().get_data()), (LPCWSTR)((save_path + ".tmp").utf16().get_data()), nullptr, 2 | 4, nullptr, nullptr);
}
if (rename_error) {
Expand Down Expand Up @@ -205,6 +205,7 @@ void FileAccessWindows::seek(uint64_t p_position) {

void FileAccessWindows::seek_end(int64_t p_position) {
ERR_FAIL_COND(!f);

if (_fseeki64(f, p_position, SEEK_END)) {
check_errors();
}
Expand Down Expand Up @@ -237,6 +238,7 @@ bool FileAccessWindows::eof_reached() const {

uint8_t FileAccessWindows::get_8() const {
ERR_FAIL_COND_V(!f, 0);

if (flags == READ_WRITE || flags == WRITE_READ) {
if (prev_op == WRITE) {
fflush(f);
Expand Down Expand Up @@ -273,6 +275,7 @@ Error FileAccessWindows::get_error() const {

void FileAccessWindows::flush() {
ERR_FAIL_COND(!f);

fflush(f);
if (prev_op == WRITE) {
prev_op = 0;
Expand All @@ -281,6 +284,7 @@ void FileAccessWindows::flush() {

void FileAccessWindows::store_8(uint8_t p_dest) {
ERR_FAIL_COND(!f);

if (flags == READ_WRITE || flags == WRITE_READ) {
if (prev_op == READ) {
if (last_error != ERR_FILE_EOF) {
Expand All @@ -295,6 +299,7 @@ void FileAccessWindows::store_8(uint8_t p_dest) {
void FileAccessWindows::store_buffer(const uint8_t *p_src, uint64_t p_length) {
ERR_FAIL_COND(!f);
ERR_FAIL_COND(!p_src && p_length > 0);

if (flags == READ_WRITE || flags == WRITE_READ) {
if (prev_op == READ) {
if (last_error != ERR_FILE_EOF) {
Expand Down

0 comments on commit a5c179e

Please sign in to comment.