Merge pull request #3867 from geky/fs-revert-filehandle

Filesystem: Revert deprecation of FileHandle
ARMmbed · Mar 23, 2017 · 039ef42 · 039ef42
2 parents 2fb65e7 + 18bab4e
commit 039ef42
Show file tree

Hide file tree

Showing 21 changed files with 333 additions and 373 deletions.
diff --git a/drivers/DirHandle.h b/drivers/DirHandle.h
diff --git a/drivers/FileHandle.h b/drivers/FileHandle.h
diff --git a/features/filesystem/Dir.h b/features/filesystem/Dir.h
@@ -18,6 +18,7 @@
 #define DIR_H
 
 #include "filesystem/FileSystem.h"
+#include "platform/DirHandle.h"
 
 namespace mbed {
 /** \addtogroup filesystem */
@@ -26,7 +27,7 @@ namespace mbed {
 
 /** Dir class
  */
-class Dir {
+class Dir : public DirHandle {
 public:
     /** Create an uninitialized directory
      *

diff --git a/features/filesystem/File.cpp b/features/filesystem/File.cpp
@@ -25,7 +25,7 @@ File::File()
 }
 
 File::File(FileSystem *fs, const char *path, int flags)
-    : FileLike(path), _fs(0), _file(0)
+    : _fs(0), _file(0)
 {
     open(fs, path, flags);
 }

diff --git a/features/filesystem/File.h b/features/filesystem/File.h
@@ -18,7 +18,7 @@
 #define FILE_H
 
 #include "filesystem/FileSystem.h"
-#include "drivers/FileLike.h"
+#include "platform/FileHandle.h"
 
 namespace mbed {
 /** \addtogroup filesystem */
@@ -27,7 +27,7 @@ namespace mbed {
 
 /** File class
  */
-class File : public FileLike {
+class File : public FileHandle {
 public:
     /** Create an uninitialized file
      *
@@ -75,15 +75,15 @@ class File : public FileLike {
      *  @return         The number of bytes read, 0 at end of file, negative error on failure
      */
 
-    virtual ssize_t read(void *buffer, size_t len);
+    virtual ssize_t read(void *buffer, size_t size);
 
     /** Write the contents of a buffer to a file
      *
      *  @param buffer   The buffer to write from
      *  @param size     The number of bytes to write 
      *  @return         The number of bytes written, negative error on failure
      */
-    virtual ssize_t write(const void *buffer, size_t len);
+    virtual ssize_t write(const void *buffer, size_t size);
 
     /** Flush any buffers associated with the file
      *

diff --git a/features/filesystem/FileSystem.h b/features/filesystem/FileSystem.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#include "drivers/FileBase.h"
+#include "platform/FileBase.h"
 #include "BlockDevice.h"
 
 namespace mbed {
@@ -118,7 +118,7 @@ class FileSystem : public FileBase {
      *  @param size     The number of bytes to read
      *  @return         The number of bytes read, 0 at end of file, negative error on failure
      */
-    virtual ssize_t file_read(fs_file_t file, void *buffer, size_t len) = 0;
+    virtual ssize_t file_read(fs_file_t file, void *buffer, size_t size) = 0;
 
     /** Write the contents of a buffer to a file
      *
@@ -127,7 +127,7 @@ class FileSystem : public FileBase {
      *  @param size     The number of bytes to write 
      *  @return         The number of bytes written, negative error on failure
      */
-    virtual ssize_t file_write(fs_file_t file, const void *buffer, size_t len) = 0;
+    virtual ssize_t file_write(fs_file_t file, const void *buffer, size_t size) = 0;
 
     /** Flush any buffers associated with the file
      *

diff --git a/mbed.h b/mbed.h
@@ -94,7 +94,7 @@
 #include "drivers/LowPowerTimeout.h"
 #include "drivers/LowPowerTicker.h"
 #include "drivers/LowPowerTimer.h"
-#include "drivers/LocalFileSystem.h"
+#include "platform/LocalFileSystem.h"
 #include "drivers/InterruptIn.h"
 #include "platform/mbed_wait_api.h"
 #include "hal/sleep_api.h"