Fix compilation and apply suggestions (part 2)

Author: PabloMK7

src/core/file_sys/archive_artic.cpp

@@ -381,26 +381,26 @@ ResultVal<std::size_t> ArticFileBackend::Read(u64 offset, std::size_t length, u8
 
     if (cache != nullptr) {
         return cache->Read(file_handle, offset, length, buffer);
-    } else {
-        auto req = client->NewRequest("FSFILE_Read");
+    }
 
-        req.AddParameterS32(file_handle);
-        req.AddParameterU64(offset);
-        req.AddParameterU32(static_cast<u32>(length));
+    auto req = client->NewRequest("FSFILE_Read");
 
-        auto resp = client->Send(req);
-        auto res = ArticArchive::RespResult(resp);
-        if (res.IsError())
-            return res;
+    req.AddParameterS32(file_handle);
+    req.AddParameterU64(offset);
+    req.AddParameterU32(static_cast<u32>(length));
 
-        auto read_buf = resp->GetResponseBuffer(0);
-        if (!read_buf || read_buf->second > length) {
-            return std::size_t(0);
-        }
+    auto resp = client->Send(req);
+    auto res = ArticArchive::RespResult(resp);
+    if (res.IsError())
+        return res;
 
-        memcpy(buffer, read_buf->first, read_buf->second);
-        return read_buf->second;
+    auto read_buf = resp->GetResponseBuffer(0);
+    if (!read_buf || read_buf->second > length) {
+        return std::size_t(0);
     }
+
+    memcpy(buffer, read_buf->first, read_buf->second);
+    return read_buf->second;
 }
 
 ResultVal<std::size_t> ArticFileBackend::Write(u64 offset, std::size_t length, bool flush,

src/core/file_sys/archive_artic.h

@@ -12,7 +12,7 @@
 #include "core/file_sys/file_backend.h"
 #include "core/hle/service/fs/archive.h"
 #include "core/perf_stats.h"
-#include "network/artic_base/artic_base_client.hpp"
+#include "network/artic_base/artic_base_client.h"
 
 namespace FileSys {
 class ArticArchive : public ArchiveBackend {

src/core/file_sys/archive_extsavedata.h

@@ -14,7 +14,7 @@
 #include "core/file_sys/artic_cache.h"
 #include "core/hle/result.h"
 #include "core/hle/service/fs/archive.h"
-#include "network/artic_base/artic_base_client.hpp"
+#include "network/artic_base/artic_base_client.h"
 
 namespace FileSys {
 

src/core/file_sys/archive_ncch.h

@@ -14,7 +14,7 @@
 #include "core/file_sys/artic_cache.h"
 #include "core/file_sys/file_backend.h"
 #include "core/hle/result.h"
-#include "network/artic_base/artic_base_client.hpp"
+#include "network/artic_base/artic_base_client.h"
 
 namespace Service::FS {
 enum class MediaType : u32;

src/core/file_sys/archive_source_sd_savedata.h

@@ -11,7 +11,7 @@
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/artic_cache.h"
 #include "core/hle/result.h"
-#include "network/artic_base/artic_base_client.hpp"
+#include "network/artic_base/artic_base_client.h"
 
 namespace Service::FS {
 enum class ArchiveIdCode : u32;

src/core/file_sys/artic_cache.h

@@ -16,14 +16,14 @@
 #include "common/static_lru_cache.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
-#include "network/artic_base/artic_base_client.hpp"
+#include "network/artic_base/artic_base_client.h"
 
 namespace FileSys {
 class ArticCache {
 public:
     ArticCache() = default;
 
-    ArticCache(std::shared_ptr<Network::ArticBase::Client>& cli) : client(cli) {}
+    ArticCache(const std::shared_ptr<Network::ArticBase::Client>& cli) : client(cli) {}
 
     ResultVal<std::size_t> Read(s32 file_handle, std::size_t offset, std::size_t length,
                                 u8* buffer);

src/core/file_sys/romfs_reader.h

@@ -10,7 +10,7 @@
 #include "common/file_util.h"
 #include "common/static_lru_cache.h"
 #include "core/file_sys/artic_cache.h"
-#include "network/artic_base/artic_base_client.hpp"
+#include "network/artic_base/artic_base_client.h"
 
 namespace Loader {
 enum class ResultStatus;

src/core/file_sys/secure_value_backend_artic.h

@@ -10,7 +10,7 @@
 #include "core/file_sys/secure_value_backend.h"
 #include "core/hle/result.h"
 #include "core/hle/service/fs/archive.h"
-#include "network/artic_base/artic_base_client.hpp"
+#include "network/artic_base/artic_base_client.h"
 
 namespace FileSys {
 class ArticSecureValueBackend : public SecureValueBackend {

src/core/hle/service/fs/archive.h

@@ -16,7 +16,7 @@
 #include "core/hle/result.h"
 #include "core/hle/service/fs/directory.h"
 #include "core/hle/service/fs/file.h"
-#include "network/artic_base/artic_base_client.hpp"
+#include "network/artic_base/artic_base_client.h"
 
 /// The unique system identifier hash, also known as ID0
 static constexpr char SYSTEM_ID[]{"00000000000000000000000000000000"};

src/core/hle/service/soc/soc_u.cpp

@@ -19,7 +19,7 @@
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/result.h"
 #include "core/hle/service/soc/soc_u.h"
-#include "network/socket_manager.hpp"
+#include "network/socket_manager.h"
 
 #ifdef _WIN32
 #include <winsock2.h>

src/core/loader/artic.h

@@ -11,7 +11,7 @@
 #include "core/file_sys/ncch_container.h"
 #include "core/hle/service/fs/fs_user.h"
 #include "core/loader/loader.h"
-#include "network/artic_base/artic_base_client.hpp"
+#include "network/artic_base/artic_base_client.h"
 
 namespace Loader {
 

src/network/CMakeLists.txt

@@ -2,6 +2,8 @@ add_library(network STATIC
     announce_multiplayer_session.cpp
     announce_multiplayer_session.h
     artic_base/artic_base_client.cpp
+    artic_base/artic_base_client.h
+    artic_base/artic_base_common.h
     network.cpp
     network.h
     network_settings.cpp
@@ -14,6 +16,7 @@ add_library(network STATIC
     room_member.cpp
     room_member.h
     socket_manager.cpp
+    socket_manager.h
     verify_user.cpp
     verify_user.h
 )

src/network/artic_base/artic_base_client.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "artic_base_client.hpp"
+#include "artic_base_client.h"
 #include "common/logging/log.h"
 
 #include "chrono"

src/network/artic_base/artic_base_client.hpp src/network/artic_base/artic_base_client.h

@@ -3,15 +3,16 @@
 // Refer to the license.txt file included.
 
 #pragma once
-#include <condition_variable>
-#include "artic_base_common.hpp"
+#include "condition_variable"
 #include "map"
 #include "mutex"
-#include "network/socket_manager.hpp"
 #include "optional"
 #include "string"
 #include "thread"
 
+#include "artic_base_common.h"
+#include "network/socket_manager.h"
+
 #ifdef _WIN32
 using SocketHolder = unsigned long long;
 #else