Codechange: make SetDebugString use C++-style strings and function types

src/console_cmds.cpp

@@ -1838,7 +1838,7 @@ static bool ConDebugLevel([[maybe_unused]] uint8_t argc, [[maybe_unused]] char *
 	if (argc == 1) {
 		IConsolePrint(CC_DEFAULT, "Current debug-level: '{}'", GetDebugString());
 	} else {
-		SetDebugString(argv[1], [](const std::string &err) { IConsolePrint(CC_ERROR, err); });
+		SetDebugString(argv[1], [](std::string_view err) { IConsolePrint(CC_ERROR, "{}", err); });
 	}
 
 	return true;

src/debug.cpp

@@ -8,6 +8,7 @@
 /** @file debug.cpp Handling of printing debug messages. */
 
 #include "stdafx.h"
+#include "core/string_consumer.hpp"
 #include "console_func.h"
 #include "debug.h"
 #include "string_func.h"
@@ -54,12 +55,12 @@ int _debug_random_level;
 #endif
 
 struct DebugLevel {
-	const char *name;
+	std::string_view name;
 	int *level;
 };
 
 #define DEBUG_LEVEL(x) { #x, &_debug_##x##_level }
-static const DebugLevel _debug_levels[] = {
+static const std::initializer_list<DebugLevel> _debug_levels{
 	DEBUG_LEVEL(driver),
 	DEBUG_LEVEL(grf),
 	DEBUG_LEVEL(map),
@@ -140,53 +141,47 @@ void DebugPrint(const char *category, int level, std::string &&message)
  * @param s Text describing the wanted debugging levels.
  * @param error_func The function to call if a parse error occurs.
  */
-void SetDebugString(const char *s, void (*error_func)(const std::string &))
+void SetDebugString(std::string_view s, SetDebugStringErrorFunc error_func)
 {
-	int v;
+	StringConsumer consumer{s};
-	char *end;
-	const char *t;
 
 	/* Store planned changes into map during parse */
-	std::map<const char *, int> new_levels;
+	std::map<std::string_view, int> new_levels;
 
 	/* Global debugging level? */
-	if (*s >= '0' && *s <= '9') {
+	auto level = consumer.TryReadIntegerBase<int>(10);
-		v = std::strtoul(s, &end, 0);
+	if (level.has_value()) {
-		s = end;
-
 		for (const auto &debug_level : _debug_levels) {
-			new_levels[debug_level.name] = v;
+			new_levels[debug_level.name] = *level;
 		}
 	}
 
+	static const std::string_view lowercase_letters{"abcdefghijklmnopqrstuvwxyz"};
+	static const std::string_view lowercase_letters_and_digits{"abcdefghijklmnopqrstuvwxyz0123456789"};
+
 	/* Individual levels */
-	for (;;) {
+	while (consumer.AnyBytesLeft()) {
-		/* skip delimiters */
+		consumer.SkipUntilCharIn(lowercase_letters);
-		while (*s == ' ' || *s == ',' || *s == '\t') s++;
+		if (!consumer.AnyBytesLeft()) break;
-		if (*s == '\0') break;
 
-		t = s;
+		/* Find the level by name. */
-		while (*s >= 'a' && *s <= 'z') s++;
+		std::string_view key = consumer.ReadUntilCharNotIn(lowercase_letters);
-
+		auto it = std::ranges::find(_debug_levels, key, &DebugLevel::name);
-		/* check debugging levels */
+		if (it == std::end(_debug_levels)) {
-		const DebugLevel *found = nullptr;
+			error_func(fmt::format("Unknown debug level '{}'", key));
-		for (const auto &debug_level : _debug_levels) {
-			if (s == t + strlen(debug_level.name) && strncmp(t, debug_level.name, s - t) == 0) {
-				found = &debug_level;
-				break;
-			}
-		}
-
-		if (*s == '=') s++;
-		v = std::strtoul(s, &end, 0);
-		s = end;
-		if (found != nullptr) {
-			new_levels[found->name] = v;
-		} else {
-			std::string error_string = fmt::format("Unknown debug level '{}'", std::string(t, s - t));
-			error_func(error_string);
 			return;
 		}
+
+		/* Do not skip lowercase letters, so 'net misc=2' won't be resolved
+		 * to setting 'net=2' and leaving misc untouched. */
+		consumer.SkipUntilCharIn(lowercase_letters_and_digits);
+		level = consumer.TryReadIntegerBase<int>(10);
+		if (!level.has_value()) {
+			error_func(fmt::format("Level for '{}' must be a valid integer.", key));
+			return;
+		}
+
+		new_levels[it->name] = *level;
 	}
 
 	/* Apply the changes after parse is successful */

src/debug.h

@@ -56,7 +56,8 @@ extern int _debug_random_level;
 #endif
 
 void DumpDebugFacilityNames(std::back_insert_iterator<std::string> &output_iterator);
-void SetDebugString(const char *s, void (*error_func)(const std::string &));
+using SetDebugStringErrorFunc = void(std::string_view);
+void SetDebugString(std::string_view s, SetDebugStringErrorFunc error_func);
 std::string GetDebugString();
 
 /** TicToc profiling.
@@ -92,7 +93,7 @@ struct TicToc {
 	}
 };
 
-void ShowInfoI(const std::string &str);
+void ShowInfoI(std::string_view str);
 #define ShowInfo(format_string, ...) ShowInfoI(fmt::format(FMT_STRING(format_string) __VA_OPT__(,) __VA_ARGS__))
 
 std::string GetLogPrefix(bool force = false);

src/os/unix/unix.cpp

@@ -184,7 +184,7 @@ std::string FS2OTTD(const std::string &name)
 
 #endif /* WITH_ICONV */
 
-void ShowInfoI(const std::string &str)
+void ShowInfoI(std::string_view str)
 {
 	fmt::print(stderr, "{}\n", str);
 }

src/os/windows/win32.cpp

@@ -198,7 +198,7 @@ static INT_PTR CALLBACK HelpDialogFunc(HWND wnd, UINT msg, WPARAM wParam, LPARAM
 	return FALSE;
 }
 
-void ShowInfoI(const std::string &str)
+void ShowInfoI(std::string_view str)
 {
 	if (_has_console) {
 		fmt::print(stderr, "{}\n", str);