corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing hpux bustage, bug 239465, r=dbaron

Browse Source
This commit is contained in:
bryner@brianryner.com
2004-04-02 23:48:18 +00:00
parent 13158f48e5
commit fda2e7c079
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xpcom/io/nsLocalFileUnix.cpp
View File

@@ -893,10 +893,12 @@ nsLocalFile::Remove(PRBool recursive)
InvalidateCache();
if (isDir) {
if (recursive) {
nsCOMPtr<nsDirEnumeratorUnix> dir = new nsDirEnumeratorUnix();
nsDirEnumeratorUnix *dir = new nsDirEnumeratorUnix();
if (!dir)
return NS_ERROR_OUT_OF_MEMORY;
nsCOMPtr<nsISimpleEnumerator> dirRef(dir); // release on exit
rv = dir->Init(this, PR_FALSE);
if (NS_FAILED(rv))
return rv;
@@ -1498,17 +1500,20 @@ nsLocalFile::SetFollowLinks(PRBool aFollowLinks)
NS_IMETHODIMP
nsLocalFile::GetDirectoryEntries(nsISimpleEnumerator **entries)
{
nsCOMPtr<nsDirEnumeratorUnix> dir = new nsDirEnumeratorUnix();
nsDirEnumeratorUnix *dir = new nsDirEnumeratorUnix();
if (!dir)
return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(dir);
nsresult rv = dir->Init(this, PR_FALSE);
if (NS_FAILED(rv))
return rv;
if (NS_FAILED(rv)) {
*entries = nsnull;
NS_RELEASE(dir);
} else {
*entries = dir; // transfer reference
}
/* QI needed? If not, need to ADDREF. */
return dir->QueryInterface(NS_GET_IID(nsISimpleEnumerator),
(void **)entries);
return rv;
}
NS_IMETHODIMP