From 2c50ed9f877ed22b2ab171f7da15df773ed8decd Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Mon, 13 Jan 2003 23:17:49 +0000 Subject: [PATCH] Make implementations consistent across platforms: ensure IsDirectory and IsFile return false even when the file doesn't exist (and they return an nsresult error status). b=187014 r=dougt sr=alecf git-svn-id: svn://10.0.0.236/trunk@136268 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsLocalFileOSX.cpp | 2 ++ mozilla/xpcom/io/nsLocalFileUnix.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mozilla/xpcom/io/nsLocalFileOSX.cpp b/mozilla/xpcom/io/nsLocalFileOSX.cpp index e391a9309a3..023ffde56f6 100644 --- a/mozilla/xpcom/io/nsLocalFileOSX.cpp +++ b/mozilla/xpcom/io/nsLocalFileOSX.cpp @@ -963,6 +963,7 @@ NS_IMETHODIMP nsLocalFile::IsHidden(PRBool *_retval) NS_IMETHODIMP nsLocalFile::IsDirectory(PRBool *_retval) { NS_ENSURE_ARG_POINTER(_retval); + *_retval = PR_FALSE; FSRef fsRef; nsresult rv = GetFSRefInternal(fsRef); @@ -982,6 +983,7 @@ NS_IMETHODIMP nsLocalFile::IsDirectory(PRBool *_retval) NS_IMETHODIMP nsLocalFile::IsFile(PRBool *_retval) { NS_ENSURE_ARG_POINTER(_retval); + *_retval = PR_FALSE; FSRef fsRef; nsresult rv = GetFSRefInternal(fsRef); diff --git a/mozilla/xpcom/io/nsLocalFileUnix.cpp b/mozilla/xpcom/io/nsLocalFileUnix.cpp index 4a5bd2c2528..54f3b83f0d2 100644 --- a/mozilla/xpcom/io/nsLocalFileUnix.cpp +++ b/mozilla/xpcom/io/nsLocalFileUnix.cpp @@ -1291,6 +1291,7 @@ NS_IMETHODIMP nsLocalFile::IsDirectory(PRBool *_retval) { NS_ENSURE_ARG_POINTER(_retval); + *_retval = PR_FALSE; VALIDATE_STAT_CACHE(); *_retval = S_ISDIR(mCachedStat.st_mode); return NS_OK; @@ -1300,6 +1301,7 @@ NS_IMETHODIMP nsLocalFile::IsFile(PRBool *_retval) { NS_ENSURE_ARG_POINTER(_retval); + *_retval = PR_FALSE; VALIDATE_STAT_CACHE(); *_retval = S_ISREG(mCachedStat.st_mode); return NS_OK;