From 5608827429a024d1ab273e704a525c6218a2052e Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 5 Dec 2016 18:50:52 +0800 Subject: [PATCH] Simplify function call --- src/base/utils/fs.cpp | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/base/utils/fs.cpp b/src/base/utils/fs.cpp index 1a758f755..361a14680 100644 --- a/src/base/utils/fs.cpp +++ b/src/base/utils/fs.cpp @@ -310,26 +310,10 @@ qlonglong Utils::Fs::freeDiskSpaceOnPath(QString path) } #endif #else - typedef BOOL (WINAPI *GetDiskFreeSpaceEx_t)(LPCTSTR, - PULARGE_INTEGER, - PULARGE_INTEGER, - PULARGE_INTEGER); - GetDiskFreeSpaceEx_t pGetDiskFreeSpaceEx = - (GetDiskFreeSpaceEx_t)::GetProcAddress(::GetModuleHandleW(L"kernel32.dll"), "GetDiskFreeSpaceExW"); - if (pGetDiskFreeSpaceEx) { - ULARGE_INTEGER bytesFree, bytesTotal; - unsigned long long *ret; - if (pGetDiskFreeSpaceEx((LPCTSTR)(toNativePath(dir_path.path())).utf16(), &bytesFree, &bytesTotal, NULL)) { - ret = (unsigned long long*)&bytesFree; - return *ret; - } - else { - return -1; - } - } - else { + ULARGE_INTEGER bytesFree; + if (GetDiskFreeSpaceExW((LPCTSTR)(toNativePath(dir_path.path())).utf16(), &bytesFree, NULL, NULL) == 0) return -1; - } + return qlonglong(bytesFree.QuadPart); #endif }