getNextFileName return String directly

Author: Lucasczm

libraries/FS/src/FS.cpp

@@ -194,12 +194,12 @@ boolean File::seekDir(long position){
     return _p->seekDir(position);
 }
 
-boolean File::getNextFileName(String &filename)
+String File::getNextFileName(void)
 {
     if (!_p) {
-        return NULL; 
+        return ""; 
     }
-    return _p->getNextFileName(filename);
+    return _p->getNextFileName();
 
 }
 

libraries/FS/src/FS.h

@@ -80,7 +80,7 @@ class File : public Stream
     boolean isDirectory(void);
     boolean seekDir(long position);
     File openNextFile(const char* mode = FILE_READ);
-    boolean getNextFileName(String &filename);
+    String getNextFileName(void);
     void rewindDirectory(void);
 
 protected:

libraries/FS/src/FSImpl.h

@@ -44,7 +44,7 @@ class FileImpl
     virtual boolean isDirectory(void) = 0;
     virtual FileImplPtr openNextFile(const char* mode) = 0;
     virtual boolean seekDir(long position);
-    virtual boolean getNextFileName(String &filename);
+    virtual String getNextFileName(void);
     virtual void rewindDirectory(void) = 0;
     virtual operator bool() = 0;
 };

libraries/FS/src/vfs_api.cpp

@@ -485,30 +485,25 @@ boolean VFSFileImpl::seekDir(long position){
 }
 
 
-boolean VFSFileImpl::getNextFileName(String &filename)
+String VFSFileImpl::getNextFileName()
 {
     if (!_isDirectory || !_d) {
-        return false;
+        return "";
     }
     struct dirent *file = readdir(_d);
     if (file == NULL) {
-        return false;
+        return "";
     }
     if (file->d_type != DT_REG && file->d_type != DT_DIR) {
-        return false;
+        return "";
     }
     String fname = String(file->d_name);
     String name = String(_path);
     if (!fname.startsWith("/") && !name.endsWith("/")) {
         name += "/";
     }
     name += fname;
-    if (name.length() > 0) {
-        filename = name;
-        return true;
-    } else {
-        return false;
-    }
+    return name;
 }
 
 void VFSFileImpl::rewindDirectory(void)

libraries/FS/src/vfs_api.h

@@ -72,7 +72,7 @@ class VFSFileImpl : public FileImpl
     time_t      getLastWrite()  override;
     boolean     isDirectory(void) override;
     boolean     seekDir(long position) override;
-    boolean     getNextFileName(String &filename) override;
+    String      getNextFileName(void) override;
     FileImplPtr openNextFile(const char* mode) override;
     void        rewindDirectory(void) override;
     operator    bool();