Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FASTLOAD_20010703_BRANCH landing, r=dbaron, sr=shaver.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@100030 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org
2001-07-31 19:05:34 +00:00
parent 7ec0196e26
commit f5bc62edea
118 changed files with 10050 additions and 3093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
mozilla/xpcom/io/nsDirectoryService.cpp
View File

@@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
@@ -563,12 +563,12 @@ static PRBool FindProviderFile(nsISupports* aElement, void *aData)
nsresult rv;
nsCOMPtr<nsIDirectoryServiceProvider> prov = do_QueryInterface(aElement);
if (!prov)
return PR_FALSE;
return PR_FALSE;
FileData* fileData = (FileData*)aData;
rv = prov->GetFile(fileData->property, &fileData->persistent, &(fileData->file) );
if (NS_SUCCEEDED(rv) && fileData->file)
return PR_FALSE;
return PR_FALSE;
return PR_TRUE;
}
@@ -591,37 +591,35 @@ nsDirectoryService::Get(const char* prop, const nsIID & uuid, void* *result)
cachedFile->Clone(getter_AddRefs(cloneFile));
return cloneFile->QueryInterface(uuid, result);
}
else
{
// it is not one of our defaults, lets check any providers
FileData fileData;
fileData.property = prop;
fileData.file = nsnull;
fileData.persistent = PR_TRUE;
mProviders->EnumerateForwards(FindProviderFile, &fileData);
if (fileData.file)
{
// it is not one of our defaults, lets check any providers
FileData fileData;
fileData.property = prop;
fileData.file = nsnull;
fileData.persistent = PR_TRUE;
mProviders->EnumerateForwards(FindProviderFile, &fileData);
if (fileData.file)
{
if (fileData.persistent)
{
Set(prop, NS_STATIC_CAST(nsIFile*, fileData.file));
}
{
Set(prop, NS_STATIC_CAST(nsIFile*, fileData.file));
}
nsresult rv = (fileData.file)->QueryInterface(uuid, result);
NS_RELEASE(fileData.file); // addref occurs in FindProviderFile()
return rv;
}
FindProviderFile(NS_STATIC_CAST(nsIDirectoryServiceProvider*, this), &fileData);
if (fileData.file)
{
NS_RELEASE(fileData.file); // addref occurs in FindProviderFile()
return rv;
}
FindProviderFile(NS_STATIC_CAST(nsIDirectoryServiceProvider*, this), &fileData);
if (fileData.file)
{
if (fileData.persistent)
{
Set(prop, NS_STATIC_CAST(nsIFile*, fileData.file));
}
{
Set(prop, NS_STATIC_CAST(nsIFile*, fileData.file));
}
nsresult rv = (fileData.file)->QueryInterface(uuid, result);
NS_RELEASE(fileData.file); // addref occurs in FindProviderFile()
return rv;
}
NS_RELEASE(fileData.file); // addref occurs in FindProviderFile()
return rv;
}
return NS_ERROR_FAILURE;