From a663834cd84999780dea0b414e1c287a453fdace Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Wed, 1 Apr 2015 21:11:09 +0200 Subject: [PATCH] Small code clean-up. --- src/Config.h | 2 +- src/LockedFile.cpp | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Config.h b/src/Config.h index 6aa17157..6cec376d 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_TYPE RC #define VER_LAMEXP_PATCH 4 -#define VER_LAMEXP_BUILD 1694 +#define VER_LAMEXP_BUILD 1696 #define VER_LAMEXP_CONFG 1558 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/LockedFile.cpp b/src/LockedFile.cpp index 6c092481..24770e71 100644 --- a/src/LockedFile.cpp +++ b/src/LockedFile.cpp @@ -54,9 +54,11 @@ static const bool g_useFileDescrForQFile = false; #endif +#define VALID_HANDLE(H) (((H) != NULL) && ((H) != INVALID_HANDLE_VALUE)) + static void CLOSE_HANDLE(HANDLE &h) { - if((h != NULL) && (h != INVALID_HANDLE_VALUE)) + if(VALID_HANDLE(h)) { CloseHandle(h); h = NULL; @@ -145,13 +147,13 @@ LockedFile::LockedFile(QResource *const resource, const QString &outPath, const for(int i = 0; i < 64; i++) { fileHandle = CreateFileW(MUTILS_WCHR(QDir::toNativeSeparators(m_filePath)), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL); - if((fileHandle != NULL) && (fileHandle != INVALID_HANDLE_VALUE)) break; + if(VALID_HANDLE(fileHandle)) break; if(!i) qWarning("Failed to lock file on first attemp, retrying..."); Sleep(100); } //Locked successfully? - if((fileHandle == NULL) || (fileHandle == INVALID_HANDLE_VALUE)) + if(!VALID_HANDLE(fileHandle)) { QFile::remove(QFileInfo(outFile).canonicalFilePath()); MUTILS_THROW_FMT("File '%s' could not be locked!", MUTILS_UTF8(QFileInfo(m_filePath).fileName())); @@ -224,13 +226,13 @@ LockedFile::LockedFile(const QString &filePath, const bool bOwnsFile) for(int i = 0; i < 64; i++) { fileHandle = CreateFileW(MUTILS_WCHR(QDir::toNativeSeparators(m_filePath)), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL); - if((fileHandle != NULL) && (fileHandle != INVALID_HANDLE_VALUE)) break; + if(VALID_HANDLE(fileHandle)) break; if(!i) qWarning("Failed to lock file on first attemp, retrying..."); Sleep(100); } //Locked successfully? - if((fileHandle == NULL) || (fileHandle == INVALID_HANDLE_VALUE)) + if(!VALID_HANDLE(fileHandle)) { MUTILS_THROW_FMT("File '%s' could not be locked!", MUTILS_UTF8(QFileInfo(m_filePath).fileName())); }