From be3eff76db37647abe4b9782e9cf9e970fd97a7c Mon Sep 17 00:00:00 2001
From: "valeski%netscape.com"
 <valeski%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 10 Aug 2000 05:23:05 +0000
Subject: [PATCH] fixing windows hatred of goto inits

git-svn-id: svn://10.0.0.236/trunk@75973 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../appfilelocprovider/src/nsAppFileLocationProvider.cpp     | 5 +++--
 mozilla/xpcom/io/nsAppFileLocationProvider.cpp               | 5 +++--
 .../appfilelocprovider/src/nsAppFileLocationProvider.cpp     | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mozilla/modules/appfilelocprovider/src/nsAppFileLocationProvider.cpp b/mozilla/modules/appfilelocprovider/src/nsAppFileLocationProvider.cpp
index a80c72d1471..a86391c2d40 100755
--- a/mozilla/modules/appfilelocprovider/src/nsAppFileLocationProvider.cpp
+++ b/mozilla/modules/appfilelocprovider/src/nsAppFileLocationProvider.cpp
@@ -641,6 +641,8 @@ static nsresult GetWindowsFolder(int folder, nsILocalFile** aFile)
     LPSTR pBuffer = NULL;
     LPITEMIDLIST pItemIDList = NULL;
     int len;
+    char *outDirectory = NULL;
+    nsCOMPtr<nsILocalFile> newFile;
  
     // Get the shell's allocator. 
     if (!SUCCEEDED(SHGetMalloc(&pMalloc))) 
@@ -663,8 +665,7 @@ static nsresult GetWindowsFolder(int folder, nsILocalFile** aFile)
     pBuffer[len + 1] = '\0';
 
     // Assign the directory
-    char* outDirectory = MakeUpperCase(pBuffer);
-    nsCOMPtr<nsILocalFile> newFile;
+    outDirectory = MakeUpperCase(pBuffer);
     rv = NS_NewLocalFile(outDirectory, TRUE, getter_AddRefs(newFile));
     if (NS_FAILED(rv))
         goto Clean;
diff --git a/mozilla/xpcom/io/nsAppFileLocationProvider.cpp b/mozilla/xpcom/io/nsAppFileLocationProvider.cpp
index a80c72d1471..a86391c2d40 100755
--- a/mozilla/xpcom/io/nsAppFileLocationProvider.cpp
+++ b/mozilla/xpcom/io/nsAppFileLocationProvider.cpp
@@ -641,6 +641,8 @@ static nsresult GetWindowsFolder(int folder, nsILocalFile** aFile)
     LPSTR pBuffer = NULL;
     LPITEMIDLIST pItemIDList = NULL;
     int len;
+    char *outDirectory = NULL;
+    nsCOMPtr<nsILocalFile> newFile;
  
     // Get the shell's allocator. 
     if (!SUCCEEDED(SHGetMalloc(&pMalloc))) 
@@ -663,8 +665,7 @@ static nsresult GetWindowsFolder(int folder, nsILocalFile** aFile)
     pBuffer[len + 1] = '\0';
 
     // Assign the directory
-    char* outDirectory = MakeUpperCase(pBuffer);
-    nsCOMPtr<nsILocalFile> newFile;
+    outDirectory = MakeUpperCase(pBuffer);
     rv = NS_NewLocalFile(outDirectory, TRUE, getter_AddRefs(newFile));
     if (NS_FAILED(rv))
         goto Clean;
diff --git a/mozilla/xpfe/appfilelocprovider/src/nsAppFileLocationProvider.cpp b/mozilla/xpfe/appfilelocprovider/src/nsAppFileLocationProvider.cpp
index a80c72d1471..a86391c2d40 100755
--- a/mozilla/xpfe/appfilelocprovider/src/nsAppFileLocationProvider.cpp
+++ b/mozilla/xpfe/appfilelocprovider/src/nsAppFileLocationProvider.cpp
@@ -641,6 +641,8 @@ static nsresult GetWindowsFolder(int folder, nsILocalFile** aFile)
     LPSTR pBuffer = NULL;
     LPITEMIDLIST pItemIDList = NULL;
     int len;
+    char *outDirectory = NULL;
+    nsCOMPtr<nsILocalFile> newFile;
  
     // Get the shell's allocator. 
     if (!SUCCEEDED(SHGetMalloc(&pMalloc))) 
@@ -663,8 +665,7 @@ static nsresult GetWindowsFolder(int folder, nsILocalFile** aFile)
     pBuffer[len + 1] = '\0';
 
     // Assign the directory
-    char* outDirectory = MakeUpperCase(pBuffer);
-    nsCOMPtr<nsILocalFile> newFile;
+    outDirectory = MakeUpperCase(pBuffer);
     rv = NS_NewLocalFile(outDirectory, TRUE, getter_AddRefs(newFile));
     if (NS_FAILED(rv))
         goto Clean;