diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-26 22:35:31 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-26 22:35:31 +0100 |
| commit | c3b0ee59412f16427194518f5261eeb7cf002606 (patch) | |
| tree | 65a5e59cf4a70bde2c43562cd821cc90f772bde6 /drivers | |
| parent | 16fa7885109988df1a2cec2b1859d2658dfbcae8 (diff) | |
| download | redot-engine-c3b0ee59412f16427194518f5261eeb7cf002606.tar.gz | |
Fix code style issues
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/unix/dir_access_unix.h | 1 | ||||
| -rw-r--r-- | drivers/windows/dir_access_windows.cpp | 34 | ||||
| -rw-r--r-- | drivers/windows/dir_access_windows.h | 1 |
3 files changed, 17 insertions, 19 deletions
diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h index b85ae719ff..579cb0e798 100644 --- a/drivers/unix/dir_access_unix.h +++ b/drivers/unix/dir_access_unix.h @@ -84,7 +84,6 @@ public: virtual String get_filesystem_type() const; - DirAccessUnix(); ~DirAccessUnix(); }; diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 8ac4e53c65..499bb4f34b 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -347,27 +347,27 @@ size_t DirAccessWindows::get_space_left() { } String DirAccessWindows::get_filesystem_type() const { - String path = fix_path(const_cast<DirAccessWindows*>(this)->get_current_dir()); - print_line("fixed path: "+path); + String path = fix_path(const_cast<DirAccessWindows *>(this)->get_current_dir()); + print_line("fixed path: " + path); int unit_end = path.find(":"); - ERR_FAIL_COND_V(unit_end==-1,String()); - String unit = path.substr(0,unit_end+1) + "\\"; - print_line("unit: "+unit); + ERR_FAIL_COND_V(unit_end == -1, String()); + String unit = path.substr(0, unit_end + 1) + "\\"; + print_line("unit: " + unit); WCHAR szVolumeName[100]; WCHAR szFileSystemName[10]; - DWORD dwSerialNumber = 0; - DWORD dwMaxFileNameLength = 0; - DWORD dwFileSystemFlags = 0; - - if(::GetVolumeInformationW(unit.c_str(), - szVolumeName, - sizeof(szVolumeName), - &dwSerialNumber, - &dwMaxFileNameLength, - &dwFileSystemFlags, - szFileSystemName, - sizeof(szFileSystemName)) == TRUE) { + DWORD dwSerialNumber = 0; + DWORD dwMaxFileNameLength = 0; + DWORD dwFileSystemFlags = 0; + + if (::GetVolumeInformationW(unit.c_str(), + szVolumeName, + sizeof(szVolumeName), + &dwSerialNumber, + &dwMaxFileNameLength, + &dwFileSystemFlags, + szFileSystemName, + sizeof(szFileSystemName)) == TRUE) { return String(szFileSystemName); } diff --git a/drivers/windows/dir_access_windows.h b/drivers/windows/dir_access_windows.h index b8599d5c26..10eee07f0c 100644 --- a/drivers/windows/dir_access_windows.h +++ b/drivers/windows/dir_access_windows.h @@ -84,7 +84,6 @@ public: virtual String get_filesystem_type() const; - DirAccessWindows(); ~DirAccessWindows(); }; |