From 066d3281b5a0d0fe10634b9f7c109dc69d656f09 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Thu, 5 Aug 2021 20:54:37 +0200
Subject: [PATCH] Kernel: Make AsyncDeviceRequest::name() return StringView

---
 Kernel/Devices/AsyncDeviceRequest.h | 2 +-
 Kernel/Devices/BlockDevice.h        | 6 +++---
 Kernel/Thread.h                     | 2 +-
 Kernel/ThreadBlockers.cpp           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Kernel/Devices/AsyncDeviceRequest.h b/Kernel/Devices/AsyncDeviceRequest.h
index b5c00356270..b7692020d33 100644
--- a/Kernel/Devices/AsyncDeviceRequest.h
+++ b/Kernel/Devices/AsyncDeviceRequest.h
@@ -54,7 +54,7 @@ public:
 
     virtual ~AsyncDeviceRequest();
 
-    virtual const char* name() const = 0;
+    virtual StringView name() const = 0;
     virtual void start() = 0;
 
     void add_sub_request(NonnullRefPtr<AsyncDeviceRequest>);
diff --git a/Kernel/Devices/BlockDevice.h b/Kernel/Devices/BlockDevice.h
index c338c5a9ccf..23cfe427000 100644
--- a/Kernel/Devices/BlockDevice.h
+++ b/Kernel/Devices/BlockDevice.h
@@ -29,13 +29,13 @@ public:
     size_t buffer_size() const { return m_buffer_size; }
 
     virtual void start() override;
-    virtual const char* name() const override
+    virtual StringView name() const override
     {
         switch (m_request_type) {
         case Read:
-            return "BlockDeviceRequest (read)";
+            return "BlockDeviceRequest (read)"sv;
         case Write:
-            return "BlockDeviceRequest (write)";
+            return "BlockDeviceRequest (write)"sv;
         default:
             VERIFY_NOT_REACHED();
         }
diff --git a/Kernel/Thread.h b/Kernel/Thread.h
index f1eda0dae40..0bfdbf6f76a 100644
--- a/Kernel/Thread.h
+++ b/Kernel/Thread.h
@@ -527,7 +527,7 @@ public:
 
     class QueueBlocker : public Blocker {
     public:
-        explicit QueueBlocker(WaitQueue&, const char* block_reason = nullptr);
+        explicit QueueBlocker(WaitQueue&, StringView block_reason = {});
         virtual ~QueueBlocker();
 
         virtual Type blocker_type() const override { return Type::Queue; }
diff --git a/Kernel/ThreadBlockers.cpp b/Kernel/ThreadBlockers.cpp
index c79afcc387b..30894af6ba2 100644
--- a/Kernel/ThreadBlockers.cpp
+++ b/Kernel/ThreadBlockers.cpp
@@ -118,7 +118,7 @@ bool Thread::JoinBlocker::unblock(void* value, bool from_add_blocker)
     return true;
 }
 
-Thread::QueueBlocker::QueueBlocker(WaitQueue& wait_queue, const char* block_reason)
+Thread::QueueBlocker::QueueBlocker(WaitQueue& wait_queue, StringView block_reason)
     : m_block_reason(block_reason)
 {
     if (!set_block_condition(wait_queue, Thread::current()))