Refactoring: Reduce indention

Signed-off-by: Sven Strickroth <[email protected]>

Author: csware

src/Utils/LangDll.cpp

@@ -1,5 +1,6 @@
 // TortoiseGit - a Windows shell extension for easy version control
 
+// Copyright (C) 2016 - TortoiseGit
 // Copyright (C) 2003-2006, 2008, 2013-2015 - TortoiseSVN
 
 // This program is free software; you can redistribute it and/or
@@ -42,50 +43,49 @@ HINSTANCE CLangDll::Init(LPCTSTR appname, unsigned long langID)
 	_tcscpy_s(sVer, MAX_PATH, _T(STRPRODUCTVER));
 	GetModuleFileName(NULL, langpath, MAX_PATH);
 	TCHAR * pSlash = _tcsrchr(langpath, '\\');
-	if (pSlash)
+	if (!pSlash)
+		return m_hInstance;
+
+	*pSlash = 0;
+	pSlash = _tcsrchr(langpath, '\\');
+	if (!pSlash)
+		return m_hInstance;
+
+	*pSlash = 0;
+	_tcscat_s(langpath, MAX_PATH, _T("\\Languages\\"));
+	assert(m_hInstance == nullptr);
+	do
 	{
-		*pSlash = 0;
-		pSlash = _tcsrchr(langpath, '\\');
-		if (pSlash)
+		_stprintf_s(langdllpath, MAX_PATH, _T("%s%s%lu.dll"), langpath, appname, langID);
+
+		m_hInstance = LoadLibrary(langdllpath);
+
+		if (!DoVersionStringsMatch(sVer, langdllpath))
 		{
-			*pSlash = 0;
-			_tcscat_s(langpath, MAX_PATH, _T("\\Languages\\"));
-			assert(m_hInstance == NULL);
-			do
-			{
-				_stprintf_s(langdllpath, MAX_PATH, _T("%s%s%lu.dll"), langpath, appname, langID);
-
-				m_hInstance = LoadLibrary(langdllpath);
-
-				if (!DoVersionStringsMatch(sVer, langdllpath))
-				{
-					FreeLibrary(m_hInstance);
-					m_hInstance = NULL;
-				}
-				if (m_hInstance == NULL)
-				{
-					DWORD lid = SUBLANGID(langID);
-					lid--;
-					if (lid > 0)
-					{
-						langID = MAKELANGID(PRIMARYLANGID(langID), lid);
-					}
-					else
-						langID = 0;
-				}
-			} while ((m_hInstance == NULL) && (langID != 0));
+			FreeLibrary(m_hInstance);
+			m_hInstance = nullptr;
 		}
-	}
+		if (!m_hInstance)
+		{
+			DWORD lid = SUBLANGID(langID);
+			lid--;
+			if (lid > 0)
+				langID = MAKELANGID(PRIMARYLANGID(langID), lid);
+			else
+				langID = 0;
+		}
+	} while (!m_hInstance && (langID != 0));
+
 	return m_hInstance;
 }
 
 void CLangDll::Close()
 {
-	if (m_hInstance)
-	{
-		FreeLibrary(m_hInstance);
-		m_hInstance = NULL;
-	}
+	if (!m_hInstance)
+		return;
+
+	FreeLibrary(m_hInstance);
+	m_hInstance = nullptr;
 }
 
 bool CLangDll::DoVersionStringsMatch(LPCTSTR sVer, LPCTSTR langDll) const
@@ -96,48 +96,34 @@ bool CLangDll::DoVersionStringsMatch(LPCTSTR sVer, LPCTSTR langDll) const
 		WORD wCharacterSet;
 	};
 
-	bool bReturn = false;
 	DWORD dwReserved = 0;
 	DWORD dwBufferSize = GetFileVersionInfoSize((LPTSTR)langDll,&dwReserved);
 
-	if (dwBufferSize > 0)
-	{
-		auto pBuffer = std::make_unique<BYTE[]>(dwBufferSize);
+	if (dwBufferSize <= 0)
+		return false;
 
-		if (pBuffer)
-		{
-			UINT        nInfoSize = 0,
-				nFixedLength = 0;
-			LPSTR       lpVersion = NULL;
-			VOID*       lpFixedPointer;
-			TRANSARRAY* lpTransArray;
-			TCHAR       strLangProductVersion[MAX_PATH] = {0};
-
-			GetFileVersionInfo((LPTSTR)langDll,
-				dwReserved,
-				dwBufferSize,
-				pBuffer.get());
-
-			VerQueryValue(pBuffer.get(),
-				_T("\\VarFileInfo\\Translation"),
-				&lpFixedPointer,
-				&nFixedLength);
-			lpTransArray = (TRANSARRAY*) lpFixedPointer;
-
-			_stprintf_s(strLangProductVersion, MAX_PATH,
-						_T("\\StringFileInfo\\%04x%04x\\ProductVersion"),
-						lpTransArray[0].wLanguageID,
-						lpTransArray[0].wCharacterSet);
-
-			VerQueryValue(pBuffer.get(),
-				(LPTSTR)strLangProductVersion,
-				(LPVOID *)&lpVersion,
-				&nInfoSize);
-			if (lpVersion && nInfoSize)
-				bReturn = (_tcscmp(sVer, (LPCTSTR)lpVersion)==0);
-		}
-	}
+	auto pBuffer = std::make_unique<BYTE[]>(dwBufferSize);
 
-	return bReturn;
-}
+	if (!pBuffer)
+		return false;
+
+	UINT        nInfoSize = 0, nFixedLength = 0;
+	LPSTR       lpVersion = nullptr;
+	VOID*       lpFixedPointer;
+	TRANSARRAY* lpTransArray;
+	TCHAR       strLangProductVersion[MAX_PATH] = { 0 };
+
+	if (!GetFileVersionInfo((LPTSTR)langDll, dwReserved, dwBufferSize, pBuffer.get()))
+		return false;
 
+	VerQueryValue(pBuffer.get(), _T("\\VarFileInfo\\Translation"), &lpFixedPointer, &nFixedLength);
+	lpTransArray = (TRANSARRAY*)lpFixedPointer;
+
+	_stprintf_s(strLangProductVersion, MAX_PATH, _T("\\StringFileInfo\\%04x%04x\\ProductVersion"), lpTransArray[0].wLanguageID, lpTransArray[0].wCharacterSet);
+
+	VerQueryValue(pBuffer.get(), (LPTSTR)strLangProductVersion, (LPVOID*)&lpVersion, &nInfoSize);
+	if (lpVersion && nInfoSize)
+		return (_tcscmp(sVer, (LPCTSTR)lpVersion) == 0);
+
+	return false;
+}

src/Utils/ShellUpdater.cpp

@@ -1,6 +1,6 @@
 // TortoiseGit - a Windows shell extension for easy version control
 
-// Copyright (C) 2012-2013, 2015 - TortoiseGit
+// Copyright (C) 2012-2013, 2015-2016 - TortoiseGit
 // Copyright (C) 2003-2008,2011,2014 - TortoiseSVN
 
 // This program is free software; you can redistribute it and/or
@@ -69,13 +69,13 @@ void CShellUpdater::AddPathsForUpdate(const CTGitPathList& pathList)
 
 void CShellUpdater::Flush()
 {
-	if (!m_pathsForUpdating.IsEmpty())
-	{
-		CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Flushing shell update list\n");
+	if (m_pathsForUpdating.IsEmpty())
+		return;
 
-		UpdateShell();
-		m_pathsForUpdating.Clear();
-	}
+	CTraceToOutputDebugString::Instance()(__FUNCTION__ ": Flushing shell update list\n");
+
+	UpdateShell();
+	m_pathsForUpdating.Clear();
 }
 
 void CShellUpdater::UpdateShell()
@@ -164,18 +164,18 @@ bool CShellUpdater::RebuildIcons()
 {
 	const int BUFFER_SIZE = 1024;
 	TCHAR buf[BUFFER_SIZE] = { 0 };
-	HKEY hRegKey = 0;
+	HKEY hRegKey = nullptr;
 	DWORD dwRegValue;
 	DWORD dwRegValueTemp;
 	DWORD dwSize;
 	DWORD_PTR dwResult;
 	LONG lRegResult;
-	bool bResult = false;
 
 	lRegResult = RegOpenKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\Desktop\\WindowMetrics"),
 		0, KEY_READ | KEY_WRITE, &hRegKey);
 	if (lRegResult != ERROR_SUCCESS)
-		goto Cleanup;
+		return false;
+	SCOPE_EXIT { RegCloseKey(hRegKey); };
 
 	// we're going to change the Shell Icon Size value
 	const TCHAR* sRegValueName = _T("Shell Icon Size");
@@ -193,7 +193,7 @@ bool CShellUpdater::RebuildIcons()
 		_sntprintf_s(buf, BUFFER_SIZE, BUFFER_SIZE, _T("%d"), iDefaultIconSize);
 	}
 	else if (lRegResult != ERROR_SUCCESS)
-		goto Cleanup;
+		return false;
 
 	// Change registry value
 	dwRegValue = _ttoi(buf);
@@ -203,8 +203,7 @@ bool CShellUpdater::RebuildIcons()
 	lRegResult = RegSetValueEx(hRegKey, sRegValueName, 0, REG_SZ,
 		(LPBYTE) buf, dwSize);
 	if (lRegResult != ERROR_SUCCESS)
-		goto Cleanup;
-
+		return false;
 
 	// Update all windows
 	SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, SPI_SETNONCLIENTMETRICS,
@@ -214,19 +213,12 @@ bool CShellUpdater::RebuildIcons()
 	dwSize = _sntprintf_s(buf, BUFFER_SIZE, BUFFER_SIZE, _T("%lu"), dwRegValue) + sizeof(TCHAR);
 	lRegResult = RegSetValueEx(hRegKey, sRegValueName, 0, REG_SZ,
 		(LPBYTE) buf, dwSize);
-	if(lRegResult != ERROR_SUCCESS)
-		goto Cleanup;
+	if (lRegResult != ERROR_SUCCESS)
+		return false;
 
 	// Update all windows
 	SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, SPI_SETNONCLIENTMETRICS,
 		0, SMTO_ABORTIFHUNG, 5000, &dwResult);
 
-	bResult = true;
-
-Cleanup:
-	if (hRegKey != 0)
-	{
-		RegCloseKey(hRegKey);
-	}
-	return bResult;
+	return true;
 }