X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=cli%2Fcli_dump.cpp;h=f9595683e77663b5d10fa44a41b1de24745fee5a;hb=a7e7b27a13dc40db4ec96bc1bba667644ef0a896;hp=f52b83c3e0dcbde9cd3b5bb6347fb9a064a8a0a7;hpb=d77719321a250beb62dbbabb93658ffe7eb796e5;p=apitrace diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp index f52b83c..f959568 100644 --- a/cli/cli_dump.cpp +++ b/cli/cli_dump.cpp @@ -38,6 +38,7 @@ #include "trace_parser.hpp" #include "trace_dump.hpp" #include "trace_callset.hpp" +#include "trace_option.hpp" enum ColorOption { @@ -98,25 +99,6 @@ longOptions[] = { {0, 0, 0, 0} }; -static bool -boolOption(const char *option, bool default_ = true) { - if (!option) { - return default_; - } - if (strcmp(option, "0") == 0 || - strcmp(option, "no") == 0 || - strcmp(option, "false") == 0) { - return false; - } - if (strcmp(option, "0") == 0 || - strcmp(option, "yes") == 0 || - strcmp(option, "true") == 0) { - return true; - } - std::cerr << "error: unexpected bool " << option << "\n"; - return default_; -} - static int command(int argc, char *argv[]) { @@ -149,17 +131,17 @@ command(int argc, char *argv[]) } break; case THREAD_IDS_OPT: - dumpThreadIds = boolOption(optarg); + dumpThreadIds = trace::boolOption(optarg); break; case CALL_NOS_OPT: - if (boolOption(optarg)) { + if (trace::boolOption(optarg)) { dumpFlags &= ~trace::DUMP_FLAG_NO_CALL_NO; } else { dumpFlags |= trace::DUMP_FLAG_NO_CALL_NO; } break; case ARG_NAMES_OPT: - if (boolOption(optarg)) { + if (trace::boolOption(optarg)) { dumpFlags &= ~trace::DUMP_FLAG_NO_ARG_NAMES; } else { dumpFlags |= trace::DUMP_FLAG_NO_ARG_NAMES;