From 5a4918cdf15b82f14d4b649592aae1d368c91bb7 Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Wed, 26 Apr 2000 21:37:45 +0000 Subject: [PATCH] Patch from Tim Rowley . From his email: Your checkin v1.9 to nsDirectoryService.cpp broke a SUNWspro4.2 debug build of mozilla, causing xpcom to fail initializing. The root problem was that nsDirectoryService::Create() was failing. This appears to a mistake caused by a shadowed copy of the "rv" variable in that method. The fix below causes the SUNWspro build to start up normally. Not sure why this didn't break other platforms. git-svn-id: svn://10.0.0.236/trunk@67292 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsDirectoryService.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla/xpcom/io/nsDirectoryService.cpp b/mozilla/xpcom/io/nsDirectoryService.cpp index e2232023d67..e673ac84b3c 100644 --- a/mozilla/xpcom/io/nsDirectoryService.cpp +++ b/mozilla/xpcom/io/nsDirectoryService.cpp @@ -299,7 +299,7 @@ nsDirectoryService::Create(nsISupports *outer, REFNSIID aIID, void **aResult) // use this to temporarily hold a reference to mService: nsCOMPtr serv = mService; - nsresult rv = mService->Init(); + rv = mService->Init(); if (NS_FAILED(rv)) return rv; rv = mService->QueryInterface(aIID, aResult); }