From b35a6b206b2ca4c7cf5a2b94b7c732b8670218b0 Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Wed, 26 Apr 2023 19:57:20 -0400 Subject: [PATCH] IPCMagicLinter: Use `LibMain` --- Meta/Lagom/Tools/IPCMagicLinter/CMakeLists.txt | 2 +- Meta/Lagom/Tools/IPCMagicLinter/main.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Meta/Lagom/Tools/IPCMagicLinter/CMakeLists.txt b/Meta/Lagom/Tools/IPCMagicLinter/CMakeLists.txt index 68e0847e1f5..4a221c77e51 100644 --- a/Meta/Lagom/Tools/IPCMagicLinter/CMakeLists.txt +++ b/Meta/Lagom/Tools/IPCMagicLinter/CMakeLists.txt @@ -2,4 +2,4 @@ set(SOURCES main.cpp ) -lagom_tool(IPCMagicLinter) +lagom_tool(IPCMagicLinter LIBS LibMain) diff --git a/Meta/Lagom/Tools/IPCMagicLinter/main.cpp b/Meta/Lagom/Tools/IPCMagicLinter/main.cpp index f48e01bc178..da4df0b0e9f 100644 --- a/Meta/Lagom/Tools/IPCMagicLinter/main.cpp +++ b/Meta/Lagom/Tools/IPCMagicLinter/main.cpp @@ -8,23 +8,23 @@ #include #include #include +#include // Exit code is bitwise-or of these values: static constexpr auto EXIT_COLLISION = 0x1; static constexpr auto EXIT_ERROR = 0x2; -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (argc < 3) { - warnln("Usage: {} path/to/some.ipc path/to/other.ipc [more ipc files ...]", argv[0]); + if (arguments.argc < 3) { + warnln("Usage: {} path/to/some.ipc path/to/other.ipc [more ipc files ...]", arguments.strings[0]); return EXIT_ERROR; } // Read files, compute their hashes, ignore collisions for now. HashMap> inverse_hashes; bool had_errors = false; - for (int file_index = 1; file_index < argc; ++file_index) { - DeprecatedString filename(argv[file_index]); + for (auto filename : arguments.strings.slice(1)) { auto file_or_error = Core::DeprecatedFile::open(filename, Core::OpenMode::ReadOnly); if (file_or_error.is_error()) { warnln("Error: Cannot open '{}': {}", filename, file_or_error.error()); @@ -77,7 +77,7 @@ int main(int argc, char** argv) had_collisions = true; } - outln("Checked {} files, saw {} distinct magic numbers.", argc - 1, inverse_hashes.size()); + outln("Checked {} files, saw {} distinct magic numbers.", arguments.argc - 1, inverse_hashes.size()); if (had_collisions) outln("Consider giving your new service a different name.");