LibCore+Everywhere: Return an Error from DirIterator::error()

This also removes DirIterator::error_string(), since the same strerror()
string will be included when you print the Error itself. Except in `ls`
which is still using fprintf() for now.

1 files changed, 7 insertions, 5 deletions

diff --git a/Userland/Utilities/ls.cpp b/Userland/Utilities/ls.cpp
index b41aec19d1..df4759f3f8 100644
--- a/Userland/Utilities/ls.cpp
+++ b/Userland/Utilities/ls.cpp
@@ -170,7 +170,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
             if (di.has_error()) {
                 status = 1;
-                fprintf(stderr, "%s: %s\n", path.characters(), di.error_string());
+                fprintf(stderr, "%s: %s\n", path.characters(), strerror(di.error().code()));
             }
 
             while (di.has_next()) {
@@ -396,7 +396,8 @@ static int do_file_system_object_long(char const* path)
     Core::DirIterator di(path, flags);
 
     if (di.has_error()) {
-        if (di.error() == ENOTDIR) {
+        auto error = di.error();
+        if (error.code() == ENOTDIR) {
             struct stat stat {
             };
             int rc = lstat(path, &stat);
@@ -406,7 +407,7 @@ static int do_file_system_object_long(char const* path)
                 return 0;
             return 2;
         }
-        fprintf(stderr, "%s: %s\n", path, di.error_string());
+        fprintf(stderr, "%s: %s\n", path, strerror(di.error().code()));
         return 1;
     }
 
@@ -510,7 +511,8 @@ int do_file_system_object_short(char const* path)
 
     Core::DirIterator di(path, flags);
     if (di.has_error()) {
-        if (di.error() == ENOTDIR) {
+        auto error = di.error();
+        if (error.code() == ENOTDIR) {
             size_t nprinted = 0;
             bool status = print_filesystem_object_short(path, path, &nprinted);
             printf("\n");
@@ -518,7 +520,7 @@ int do_file_system_object_short(char const* path)
                 return 0;
             return 2;
         }
-        fprintf(stderr, "%s: %s\n", path, di.error_string());
+        fprintf(stderr, "%s: %s\n", path, strerror(di.error().code()));
         return 1;
     }