From bf7a57fc55493247a624ecfd65e4d73964e7d8d2 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Sun, 12 Apr 2026 02:40:16 -0500 Subject: Remove vendored usvfs and Windows-only usvfs code paths The Linux port uses its own in-process FUSE VFS (FuseConnector), so usvfs was dead weight: libs/usvfs/ was never built, usvfsconnector.cpp was explicitly REMOVE_ITEM'd from the source list, and every call site was already guarded by #ifdef _WIN32 with a working Linux branch (the Windows build is also broken on this branch, since FUSE3 is a hard find_package dependency). - Drop libs/usvfs/ and src/src/usvfsconnector.{cpp,h} - Collapse #ifdef _WIN32 / usvfs include branches in organizercore, mainwindow, settings, util, spawn - Remove getUsvfsVersionString() and the "usvfs: ..." log field - Remove vfs32/64DLLName APPPARAMs (nothing reads them) - Relabel About dialog "usvfs:" row to "VFS: FUSE 3" --- libs/usvfs/src/shared/loghelpers.cpp | 96 ------------------------------------ 1 file changed, 96 deletions(-) delete mode 100644 libs/usvfs/src/shared/loghelpers.cpp (limited to 'libs/usvfs/src/shared/loghelpers.cpp') diff --git a/libs/usvfs/src/shared/loghelpers.cpp b/libs/usvfs/src/shared/loghelpers.cpp deleted file mode 100644 index bfcabf1..0000000 --- a/libs/usvfs/src/shared/loghelpers.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/* -Userspace Virtual Filesystem - -Copyright (C) 2015 Sebastian Herbord. All rights reserved. - -This file is part of usvfs. - -usvfs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -usvfs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with usvfs. If not, see . -*/ -#include - -#include "formatters.h" -#include "loghelpers.h" -#include "stringcast.h" -#include "stringutils.h" - -namespace ush = usvfs::shared; - -namespace usvfs::log -{ - -// this is declared in formatters but is defined here to avoid a whole .cpp -// file for two small functions -// -// comments from old code, taken as is: -// -// TODO this does not correctly support surrogate pairs since the size used here -// is the number of 16-bit characters in the buffer whereas toNarrow expects the -// actual number of characters. It will always underestimate though, so worst -// case scenario we truncate the string -// -std::string to_string(LPCWSTR value) -{ - if (value == nullptr) { - return ""; - } - try { - return ush::string_cast(value, ush::CodePage::UTF8); - } catch (const std::exception& e) { - return std::format("", e.what()); - } -} -std::string to_string(PCUNICODE_STRING value) -{ - try { - return ush::string_cast(value->Buffer, ush::CodePage::UTF8, - value->Length / sizeof(WCHAR)); - } catch (const std::exception& e) { - return std::format("", e.what()); - } -} - -spdlog::level::level_enum ConvertLogLevel(LogLevel level) -{ - switch (level) { - case LogLevel::Debug: - return spdlog::level::debug; - case LogLevel::Info: - return spdlog::level::info; - case LogLevel::Warning: - return spdlog::level::warn; - case LogLevel::Error: - return spdlog::level::err; - default: - return spdlog::level::debug; - } -} - -LogLevel ConvertLogLevel(spdlog::level::level_enum level) -{ - switch (level) { - case spdlog::level::debug: - return LogLevel::Debug; - case spdlog::level::info: - return LogLevel::Info; - case spdlog::level::warn: - return LogLevel::Warning; - case spdlog::level::err: - return LogLevel::Error; - default: - return LogLevel::Debug; - } -} - -} // namespace usvfs::log -- cgit v1.3.1