another stage of refactoring

include/nxst/domain/util.hpp

@@ -1,51 +1,22 @@
-/*
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program 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.
- *
- *   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
+// Copyright (C) 2024-2026 NXST contributors
 #pragma once
-#include <sys/stat.h>
 
 #include <switch.h>
 
-#include <nxst/domain/account.hpp>
-#include <nxst/domain/common.hpp>
-#include <nxst/infra/fs/io.hpp>
-
-// debug
-#include <arpa/inet.h>
-#include <sys/errno.h>
-#include <sys/socket.h>
-
-void servicesExit(void);
-Result servicesInit(void);
-HidsysNotificationLedPattern blinkLedPattern(u8 times);
+void servicesExit();
+Result servicesInit();
 void blinkLed(u8 times);
 
 namespace StringUtils {
-std::string removeAccents(std::string str);
-std::string removeNotAscii(std::string str);
-std::u16string UTF8toUTF16(const char* src);
-std::string elide(const std::string& s, size_t maxChars);
+    bool containsInvalidChar(const std::string& str);
+    std::string format(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
+    std::string removeForbiddenCharacters(std::string src);
+    std::string UTF16toUTF8(const std::u16string& src);
+    void ltrim(std::string& s);
+    void rtrim(std::string& s);
+    void trim(std::string& s);
+    std::string removeAccents(std::string str);
+    std::string removeNotAscii(std::string str);
+    std::u16string UTF8toUTF16(const char* src);
+    std::string elide(const std::string& s, size_t max_chars);
 }  // namespace StringUtils