fs: Remove platform-specific 'fs_deleteFile'

egoboo · Jan 17, 2018 · 23a89d3 · 23a89d3
1 parent b9421aa
commit 23a89d3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 22 deletions.
diff --git a/egolib/src/egolib/Platform/file_linux.c b/egolib/src/egolib/Platform/file_linux.c
@@ -139,11 +139,6 @@ int fs_removeDirectory(const std::string& pathname)
  return 0;
 }
 
-void fs_deleteFile(const std::string& pathname)
-{
- unlink(pathname.c_str());
-}
-
 bool fs_copyFile(const std::string& source, const std::string& target)
 { 
  char buf[4096] = EMPTY_CSTR;

diff --git a/egolib/src/egolib/Platform/file_mac.m b/egolib/src/egolib/Platform/file_mac.m
@@ -104,15 +104,6 @@ int fs_removeDirectory(const char *dirName)
  }
 }
 
-void fs_deleteFile(const char *fileName)
-{
- @autoreleasepool {
- NSString *path = [[NSString alloc] initWithUTF8String:fileName];
- [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
- [path release];
- }
-}
-
 bool fs_copyFile(const std::string& source, const std::string& target)
 {
  @autoreleasepool {

diff --git a/egolib/src/egolib/Platform/file_win.c b/egolib/src/egolib/Platform/file_win.c
@@ -165,14 +165,6 @@ int fs_removeDirectory(const std::string& dirname)
  return (0 != RemoveDirectory(dirname.c_str())) ? 0 : 1;
 }
 
-void fs_deleteFile( const std::string& filename )
-{
- if (!filename.empty())
- {
- DeleteFile(filename.c_str());
- }
-}
-
 bool fs_copyFile(const std::string& source, const std::string& target)
 {
  if (source.empty() || target.empty())

diff --git a/egolib/src/egolib/file_common.c b/egolib/src/egolib/file_common.c
@@ -103,6 +103,12 @@ void fs_removeDirectoryAndContents(const char *dirname)
  fs_removeDirectory(dirname);
 }
 
+//--------------------------------------------------------------------------------------------
+void fs_deleteFile(const std::string& pathname)
+{
+ id::file_system::delete_regular(pathname);
+}
+
 //--------------------------------------------------------------------------------------------
 void fs_copyDirectory(const char *sourceDir, const char *targetDir)
 {