fixing windows hatred of goto inits

git-svn-id: svn://10.0.0.236/trunk@75973 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
valeski%netscape.com 2000-08-10 05:23:05 +00:00
parent 14d36bbdb1
commit be3eff76db
3 changed files with 9 additions and 6 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;