From 4dd861ee2351a9e3ac32b6aa744965a683f52955 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 27 Feb 2015 19:13:46 +0100
Subject: fs/FileSystem: merge CheckAccess() into PathExists()

PathExists() should better do what CheckAccess() does, and
CheckAccess() doesn't do what its name implies.
---
 src/fs/FileSystem.hxx | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src/fs/FileSystem.hxx')

diff --git a/src/fs/FileSystem.hxx b/src/fs/FileSystem.hxx
index ab19b8b63..6f19c8ed3 100644
--- a/src/fs/FileSystem.hxx
+++ b/src/fs/FileSystem.hxx
@@ -122,20 +122,6 @@ CheckAccess(Path path, int mode)
 
 #endif
 
-/**
- * Checks is specified path exists and accessible.
- */
-static inline bool
-CheckAccess(Path path)
-{
-#ifdef WIN32
-	struct stat buf;
-	return StatFile(path, buf);
-#else
-	return CheckAccess(path, F_OK);
-#endif
-}
-
 /**
  * Checks if #Path exists and is a regular file.
  */
@@ -160,10 +146,14 @@ DirectoryExists(Path path, bool follow_symlinks = true)
  * Checks if #Path exists.
  */
 static inline bool
-PathExists(Path path, bool follow_symlinks = true)
+PathExists(Path path)
 {
+#ifdef WIN32
 	struct stat buf;
-	return StatFile(path, buf, follow_symlinks);
+	return StatFile(path, buf);
+#else
+	return CheckAccess(path, F_OK);
+#endif
 }
 
 #endif
-- 
cgit v1.2.3