From 8bbeee11734d3ba8e2cf15d19cb3c302f8bfdbf2 Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Sat, 7 Dec 2024 18:51:18 +0100 Subject: core: Add clang-tidy (#8664) This adds a .clang-tidy file for us. It's not a strict requirement to be compliant, but I tuned it to be alright. --- src/debug/CrashReporter.cpp | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src/debug/CrashReporter.cpp') diff --git a/src/debug/CrashReporter.cpp b/src/debug/CrashReporter.cpp index 319c1414..30494513 100644 --- a/src/debug/CrashReporter.cpp +++ b/src/debug/CrashReporter.cpp @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -31,10 +31,10 @@ static char const* const MESSAGES[] = {"Sorry, didn't mean to...", // is not async-signal-safe, fake it with time(NULL) instead char const* getRandomMessage() { - return MESSAGES[time(NULL) % (sizeof(MESSAGES) / sizeof(MESSAGES[0]))]; + return MESSAGES[time(nullptr) % (sizeof(MESSAGES) / sizeof(MESSAGES[0]))]; } -[[noreturn]] inline void exit_with_error(char const* err) { +[[noreturn]] inline void exitWithError(char const* err) { write(STDERR_FILENO, err, strlen(err)); // perror() is not signal-safe, but we use it here // because if the crash-handler already crashed, it can't get any worse. @@ -42,17 +42,17 @@ char const* getRandomMessage() { abort(); } -void CrashReporter::createAndSaveCrash(int sig) { - int reportFd; +void NCrashReporter::createAndSaveCrash(int sig) { + int reportFd = -1; // We're in the signal handler, so we *only* have stack memory. // To save as much stack memory as possible, // destroy things as soon as possible. { - MaxLengthCString<255> reportPath; + CMaxLengthCString<255> reportPath; - const auto HOME = sig_getenv("HOME"); - const auto CACHE_HOME = sig_getenv("XDG_CACHE_HOME"); + const auto HOME = sigGetenv("HOME"); + const auto CACHE_HOME = sigGetenv("XDG_CACHE_HOME"); if (CACHE_HOME && CACHE_HOME[0] != '\0') { reportPath += CACHE_HOME; @@ -61,24 +61,24 @@ void CrashReporter::createAndSaveCrash(int sig) { reportPath += HOME; reportPath += "/.cache/hyprland"; } else { - exit_with_error("$CACHE_HOME and $HOME not set, nowhere to report crash\n"); + exitWithError("$CACHE_HOME and $HOME not set, nowhere to report crash\n"); return; } - int ret = mkdir(reportPath.get_str(), S_IRWXU); + int ret = mkdir(reportPath.getStr(), S_IRWXU); //__asm__("int $3"); if (ret < 0 && errno != EEXIST) { - exit_with_error("failed to mkdir() crash report directory\n"); + exitWithError("failed to mkdir() crash report directory\n"); } reportPath += "/hyprlandCrashReport"; - reportPath.write_num(getpid()); + reportPath.writeNum(getpid()); reportPath += ".txt"; { - BufFileWriter<64> stderr(2); + CBufFileWriter<64> stderr(2); stderr += "Hyprland has crashed :( Consult the crash report at "; if (!reportPath.boundsExceeded()) { - stderr += reportPath.get_str(); + stderr += reportPath.getStr(); } else { stderr += "[ERROR: Crash report path does not fit into memory! Check if your $CACHE_HOME/$HOME is too deeply nested. Max 255 characters.]"; } @@ -86,12 +86,12 @@ void CrashReporter::createAndSaveCrash(int sig) { stderr.flush(); } - reportFd = open(reportPath.get_str(), O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); + reportFd = open(reportPath.getStr(), O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); if (reportFd < 0) { - exit_with_error("Failed to open crash report path for writing"); + exitWithError("Failed to open crash report path for writing"); } } - BufFileWriter<512> finalCrashReport(reportFd); + CBufFileWriter<512> finalCrashReport(reportFd); finalCrashReport += "--------------------------------------------\n Hyprland Crash Report\n--------------------------------------------\n"; finalCrashReport += getRandomMessage(); @@ -100,7 +100,7 @@ void CrashReporter::createAndSaveCrash(int sig) { finalCrashReport += "Hyprland received signal "; finalCrashReport.writeNum(sig); finalCrashReport += '('; - finalCrashReport += sig_strsignal(sig); + finalCrashReport += sigStrsignal(sig); finalCrashReport += ")\nVersion: "; finalCrashReport += GIT_COMMIT_HASH; finalCrashReport += "\nTag: "; @@ -122,9 +122,9 @@ void CrashReporter::createAndSaveCrash(int sig) { if (g_pPluginSystem && g_pPluginSystem->pluginCount() > 0) { finalCrashReport += "Hyprland seems to be running with plugins. This crash might not be Hyprland's fault.\nPlugins:\n"; - size_t count = g_pPluginSystem->pluginCount(); - CPlugin* plugins[count]; - g_pPluginSystem->sig_getPlugins(plugins, count); + size_t count = g_pPluginSystem->pluginCount(); + CPlugin* plugins[count] = {nullptr}; + g_pPluginSystem->sigGetPlugins(plugins, count); for (size_t i = 0; i < count; i++) { auto p = plugins[i]; @@ -241,5 +241,5 @@ void CrashReporter::createAndSaveCrash(int sig) { finalCrashReport += "\n\nLog tail:\n"; - finalCrashReport += std::string_view(Debug::rollingLog).substr(Debug::rollingLog.find("\n") + 1); + finalCrashReport += std::string_view(Debug::rollingLog).substr(Debug::rollingLog.find('\n') + 1); } -- cgit v1.2.3