From 70e40ff83fe10e8515b895147c536ba392066103 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Sat, 16 Mar 2013 17:32:28 +0800
Subject: [PATCH] Reduce variable scope

Based on TortoiseSVN revision 24010

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseIDiff/TortoiseIDiff.cpp |  6 ++----
 src/TortoiseShell/TortoiseStub.cpp  | 18 ++++++++----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/TortoiseIDiff/TortoiseIDiff.cpp b/src/TortoiseIDiff/TortoiseIDiff.cpp
index 1757c3bb1..35264e59f 100644
--- a/src/TortoiseIDiff/TortoiseIDiff.cpp
+++ b/src/TortoiseIDiff/TortoiseIDiff.cpp
@@ -1,6 +1,6 @@
 // TortoiseIDiff - an image diff viewer in TortoiseSVN and TortoiseGit
 
-// Copyright (C) 2006 - 2007, 2010-2012 - TortoiseSVN
+// Copyright (C) 2006 - 2007, 2010-2013 - TortoiseSVN
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -60,8 +60,6 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
 
     MSG msg;
-    HACCEL hAccelTable;
-
     hInst = hInstance;
 
     INITCOMMONCONTROLSEX used = {
@@ -85,7 +83,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
     mainWindow->SetRight(parser.HasVal(_T("right")) ? parser.GetVal(_T("right")) : _T(""), parser.HasVal(_T("righttitle")) ? parser.GetVal(_T("righttitle")) : _T(""));
     if (mainWindow->RegisterAndCreateWindow())
     {
-        hAccelTable = LoadAccelerators(hResource, MAKEINTRESOURCE(IDR_TORTOISEIDIFF));
+        HACCEL hAccelTable = LoadAccelerators(hResource, MAKEINTRESOURCE(IDR_TORTOISEIDIFF));
         if (!parser.HasVal(_T("left")))
         {
             PostMessage(*mainWindow, WM_COMMAND, ID_FILE_OPEN, 0);
diff --git a/src/TortoiseShell/TortoiseStub.cpp b/src/TortoiseShell/TortoiseStub.cpp
index f4ef133bb..a68725bb2 100644
--- a/src/TortoiseShell/TortoiseStub.cpp
+++ b/src/TortoiseShell/TortoiseStub.cpp
@@ -1,7 +1,7 @@
 // TortoiseGit - a Windows shell extension for easy version control
 
 // Copyright (C) 2012-2013 - TortoiseGit
-// Copyright (C) 2007, 2009 - TortoiseSVN
+// Copyright (C) 2007, 2009, 2013 - TortoiseSVN
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -260,14 +260,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID /*Reserved*/)
 		hInst = hInstance;
 		break;
 
-		//case DLL_THREAD_ATTACH:
-		//  break;
+	/*case DLL_THREAD_ATTACH:
+		break;
 
-		//case DLL_THREAD_DETACH:
-		//  break;
+	case DLL_THREAD_DETACH:
+		break;
 
-		//case DLL_PROCESS_DETACH:
-		//  break;
+	case DLL_PROCESS_DETACH:
+		break;*/
 	}
 
 	return TRUE;
@@ -293,14 +293,12 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 
 STDAPI DllCanUnloadNow(void)
 {
-	HRESULT Result;
-
 	TRACE(_T("DllCanUnloadNow() - Enter\n"));
 
 	if (pDllCanUnloadNow)
 	{
 		TRACE(_T("DllCanUnloadNow() - Forward\n"));
-		Result = pDllCanUnloadNow();
+		HRESULT Result = pDllCanUnloadNow();
 		if (Result != S_OK)
 			return Result;
 	}
-- 
2.11.4.GIT