From 8a2f56d21066b61cb5249297930e1a3ec2fdfd06 Mon Sep 17 00:00:00 2001 From: "jaggernaut%netscape.com" Date: Sat, 24 May 2003 03:11:36 +0000 Subject: [PATCH] Bug 206943: Slightly optimize NS_GetSpecialDirectory. r=dougt, sr=dbaron git-svn-id: svn://10.0.0.236/trunk@142880 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsDirectoryServiceUtils.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mozilla/xpcom/io/nsDirectoryServiceUtils.h b/mozilla/xpcom/io/nsDirectoryServiceUtils.h index 925ece123da..77c02fde016 100644 --- a/mozilla/xpcom/io/nsDirectoryServiceUtils.h +++ b/mozilla/xpcom/io/nsDirectoryServiceUtils.h @@ -36,16 +36,11 @@ NS_GetSpecialDirectory(const char* specialDirName, nsIFile* *result) nsresult rv; static NS_DEFINE_CID(kDirectoryServiceCID, NS_DIRECTORY_SERVICE_CID); nsCOMPtr serv(do_GetService(kDirectoryServiceCID, &rv)); - if (NS_FAILED(rv)) return rv; + if (NS_FAILED(rv)) + return rv; - nsCOMPtr dir; - rv = serv->Get(specialDirName, NS_GET_IID(nsIFile), getter_AddRefs(dir)); - if (NS_FAILED(rv)) return rv; - - *result = NS_STATIC_CAST(nsIFile*, NS_STATIC_CAST(nsISupports*, dir)); - if (*result) - NS_ADDREF(*result); - return NS_OK; + return serv->Get(specialDirName, NS_GET_IID(nsIFile), + NS_REINTERPRET_CAST(void**, result)); } #endif