From c30775522e0c5b2490a18e25ab512d716a1c8e3c Mon Sep 17 00:00:00 2001
From: tgsm <doodrabbit@hotmail.com>
Date: Thu, 15 Jun 2023 22:35:33 -0500
Subject: [PATCH] LibCompress/Gzip: Replace usage of DeprecatedString

---
 Userland/Libraries/LibCompress/Gzip.cpp | 10 +++++-----
 Userland/Libraries/LibCompress/Gzip.h   |  2 +-
 Userland/Utilities/file.cpp             |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Userland/Libraries/LibCompress/Gzip.cpp b/Userland/Libraries/LibCompress/Gzip.cpp
index 3b5986f8ce..6238054ee7 100644
--- a/Userland/Libraries/LibCompress/Gzip.cpp
+++ b/Userland/Libraries/LibCompress/Gzip.cpp
@@ -8,8 +8,8 @@
 #include <LibCompress/Gzip.h>
 
 #include <AK/BitStream.h>
-#include <AK/DeprecatedString.h>
 #include <AK/MemoryStream.h>
+#include <AK/String.h>
 #include <LibCore/DateTime.h>
 #include <LibCore/File.h>
 #include <LibCore/MappedFile.h>
@@ -152,17 +152,17 @@ ErrorOr<Bytes> GzipDecompressor::read_some(Bytes bytes)
     return bytes.slice(0, total_read);
 }
 
-Optional<DeprecatedString> GzipDecompressor::describe_header(ReadonlyBytes bytes)
+ErrorOr<Optional<String>> GzipDecompressor::describe_header(ReadonlyBytes bytes)
 {
     if (bytes.size() < sizeof(BlockHeader))
-        return {};
+        return OptionalNone {};
 
     auto& header = *(reinterpret_cast<BlockHeader const*>(bytes.data()));
     if (!header.valid_magic_number() || !header.supported_by_implementation())
-        return {};
+        return OptionalNone {};
 
     LittleEndian<u32> original_size = *reinterpret_cast<u32 const*>(bytes.offset(bytes.size() - sizeof(u32)));
-    return DeprecatedString::formatted("last modified: {}, original size {}", Core::DateTime::from_timestamp(header.modification_time).to_deprecated_string(), (u32)original_size);
+    return TRY(String::formatted("last modified: {}, original size {}", Core::DateTime::from_timestamp(header.modification_time), (u32)original_size));
 }
 
 ErrorOr<ByteBuffer> GzipDecompressor::decompress_all(ReadonlyBytes bytes)
diff --git a/Userland/Libraries/LibCompress/Gzip.h b/Userland/Libraries/LibCompress/Gzip.h
index ef7f67767e..1cf212ade9 100644
--- a/Userland/Libraries/LibCompress/Gzip.h
+++ b/Userland/Libraries/LibCompress/Gzip.h
@@ -54,7 +54,7 @@ public:
     static ErrorOr<ByteBuffer> decompress_all(ReadonlyBytes);
     static ErrorOr<void> decompress_file(StringView input_file, NonnullOwnPtr<Stream> output_stream);
 
-    static Optional<DeprecatedString> describe_header(ReadonlyBytes);
+    static ErrorOr<Optional<String>> describe_header(ReadonlyBytes);
     static bool is_likely_compressed(ReadonlyBytes bytes);
 
 private:
diff --git a/Userland/Utilities/file.cpp b/Userland/Utilities/file.cpp
index b6638b4d1e..e3680c24d7 100644
--- a/Userland/Utilities/file.cpp
+++ b/Userland/Utilities/file.cpp
@@ -97,7 +97,7 @@ static ErrorOr<Optional<String>> gzip_details(StringView description, StringView
     if (!Compress::GzipDecompressor::is_likely_compressed(mapped_file->bytes()))
         return OptionalNone {};
 
-    auto gzip_details = Compress::GzipDecompressor::describe_header(mapped_file->bytes());
+    auto gzip_details = TRY(Compress::GzipDecompressor::describe_header(mapped_file->bytes()));
     if (!gzip_details.has_value())
         return OptionalNone {};