From 2f2dfd1423edbcd4b8964790d3225ad8bc0b3048 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Sun, 19 Nov 2023 09:37:05 +1000 Subject: [PATCH] tools/log: accept only a single string This tool is only meant for testing purposes and it's far simpler to only support a single string commandline argument. --- tools/log.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tools/log.cpp b/tools/log.cpp index 7bbbda1b..2bdae952 100644 --- a/tools/log.cpp +++ b/tools/log.cpp @@ -15,28 +15,23 @@ enum { ARG_SELF, ARG_LEVEL, - ARG_FORMAT, + ARG_VALUE, - MIN_ARGS, + NUM_ARGS, }; int main (int const argc, char const **argv) { - if (argc < MIN_ARGS) { - std::cerr << "usage: " << argv[ARG_SELF] << " [arg]...\n"; + if (argc < NUM_ARGS) { + fmt::print (stderr, "usage {} \n", argv[ARG_SELF]); return EXIT_FAILURE; } - auto const level = cruft::log::to_level (argv[ARG_LEVEL]); - auto const format = argv[ARG_FORMAT]; + auto const level = cruft::log::to_level (argv[ARG_LEVEL]); + auto const value = argv[ARG_VALUE]; - auto const count = argc - 3; - switch (count) { - case 0: cruft::log::write (level, format); break; - case 1: cruft::log::write (level, std::string_view{format}, argv[MIN_ARGS + 0]); break; - case 2: cruft::log::write (level, std::string_view{format}, argv[MIN_ARGS + 0], argv[MIN_ARGS + 1]); break; - } + cruft::log::write (level, "{}", value); return EXIT_SUCCESS; } \ No newline at end of file