From e1b1eb3d0ef61d4aa4688025afef3eea0652aca4 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 17 Jan 2014 13:25:31 -0500 Subject: [PATCH] cmdline.cxx: don't use magic numbers And prettify the struct array. --- cmdline.cxx | 82 ++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/cmdline.cxx b/cmdline.cxx index 6107d60eb..05ab7e8e4 100644 --- a/cmdline.cxx +++ b/cmdline.cxx @@ -12,52 +12,52 @@ // NB: when adding new options, consider very carefully whether they // should be restricted from stap clients (after --client-options)! struct option stap_long_options[] = { - { "skip-badvars", 0, NULL, LONG_OPT_SKIP_BADVARS }, - { "vp", 1, NULL, LONG_OPT_VERBOSE_PASS }, - { "unprivileged", 0, NULL, LONG_OPT_UNPRIVILEGED }, + { "skip-badvars", no_argument, NULL, LONG_OPT_SKIP_BADVARS }, + { "vp", required_argument, NULL, LONG_OPT_VERBOSE_PASS }, + { "unprivileged", no_argument, NULL, LONG_OPT_UNPRIVILEGED }, #define OWE5 "tter" #define OWE1 "uild-" #define OWE6 "fu-kb" #define OWE2 "i-kno" #define OWE4 "st" #define OWE3 "w-be" - { OWE4 OWE6 OWE1 OWE2 OWE3 OWE5, 0, NULL, LONG_OPT_OMIT_WERROR }, - { "client-options", 0, NULL, LONG_OPT_CLIENT_OPTIONS }, - { "help", 0, NULL, LONG_OPT_HELP }, - { "disable-cache", 0, NULL, LONG_OPT_DISABLE_CACHE }, - { "poison-cache", 0, NULL, LONG_OPT_POISON_CACHE }, - { "clean-cache", 0, NULL, LONG_OPT_CLEAN_CACHE }, - { "compatible", 1, NULL, LONG_OPT_COMPATIBLE }, - { "ldd", 0, NULL, LONG_OPT_LDD }, - { "use-server", 2, NULL, LONG_OPT_USE_SERVER }, - { "list-servers", 2, NULL, LONG_OPT_LIST_SERVERS }, - { "trust-servers", 2, NULL, LONG_OPT_TRUST_SERVERS }, - { "use-server-on-error", 2, NULL, LONG_OPT_USE_SERVER_ON_ERROR }, - { "all-modules", 0, NULL, LONG_OPT_ALL_MODULES }, - { "remote", 1, NULL, LONG_OPT_REMOTE }, - { "remote-prefix", 0, NULL, LONG_OPT_REMOTE_PREFIX }, - { "check-version", 0, NULL, LONG_OPT_CHECK_VERSION }, - { "version", 0, NULL, LONG_OPT_VERSION }, - { "tmpdir", 1, NULL, LONG_OPT_TMPDIR }, - { "download-debuginfo", 2, NULL, LONG_OPT_DOWNLOAD_DEBUGINFO }, - { "dump-probe-types", 0, NULL, LONG_OPT_DUMP_PROBE_TYPES }, - { "privilege", 1, NULL, LONG_OPT_PRIVILEGE }, - { "suppress-handler-errors", 0, NULL, LONG_OPT_SUPPRESS_HANDLER_ERRORS }, - { "modinfo", 1, NULL, LONG_OPT_MODINFO }, - { "rlimit-as", 1, NULL, LONG_OPT_RLIMIT_AS }, - { "rlimit-cpu", 1, NULL, LONG_OPT_RLIMIT_CPU }, - { "rlimit-nproc", 1, NULL, LONG_OPT_RLIMIT_NPROC }, - { "rlimit-stack", 1, NULL, LONG_OPT_RLIMIT_STACK }, - { "rlimit-fsize", 1, NULL, LONG_OPT_RLIMIT_FSIZE }, - { "sysroot", 1, NULL, LONG_OPT_SYSROOT }, - { "sysenv", 1, NULL, LONG_OPT_SYSENV }, - { "suppress-time-limits", 0, NULL, LONG_OPT_SUPPRESS_TIME_LIMITS }, - { "runtime", 1, NULL, LONG_OPT_RUNTIME }, - { "dyninst", 0, NULL, LONG_OPT_RUNTIME_DYNINST }, - { "benchmark-sdt", 0, NULL, LONG_OPT_BENCHMARK_SDT }, - { "benchmark-sdt-loops", 1, NULL, LONG_OPT_BENCHMARK_SDT_LOOPS }, - { "benchmark-sdt-threads", 1, NULL, LONG_OPT_BENCHMARK_SDT_THREADS }, - { "color", 2, NULL, LONG_OPT_COLOR_ERRS }, - { "colour", 2, NULL, LONG_OPT_COLOR_ERRS }, + { OWE4 OWE6 OWE1 OWE2 OWE3 OWE5, no_argument, NULL, LONG_OPT_OMIT_WERROR }, + { "client-options", no_argument, NULL, LONG_OPT_CLIENT_OPTIONS }, + { "help", no_argument, NULL, LONG_OPT_HELP }, + { "disable-cache", no_argument, NULL, LONG_OPT_DISABLE_CACHE }, + { "poison-cache", no_argument, NULL, LONG_OPT_POISON_CACHE }, + { "clean-cache", no_argument, NULL, LONG_OPT_CLEAN_CACHE }, + { "compatible", required_argument, NULL, LONG_OPT_COMPATIBLE }, + { "ldd", no_argument, NULL, LONG_OPT_LDD }, + { "use-server", optional_argument, NULL, LONG_OPT_USE_SERVER }, + { "list-servers", optional_argument, NULL, LONG_OPT_LIST_SERVERS }, + { "trust-servers", optional_argument, NULL, LONG_OPT_TRUST_SERVERS }, + { "use-server-on-error", optional_argument, NULL, LONG_OPT_USE_SERVER_ON_ERROR }, + { "all-modules", no_argument, NULL, LONG_OPT_ALL_MODULES }, + { "remote", required_argument, NULL, LONG_OPT_REMOTE }, + { "remote-prefix", no_argument, NULL, LONG_OPT_REMOTE_PREFIX }, + { "check-version", no_argument, NULL, LONG_OPT_CHECK_VERSION }, + { "version", no_argument, NULL, LONG_OPT_VERSION }, + { "tmpdir", required_argument, NULL, LONG_OPT_TMPDIR }, + { "download-debuginfo", optional_argument, NULL, LONG_OPT_DOWNLOAD_DEBUGINFO }, + { "dump-probe-types", no_argument, NULL, LONG_OPT_DUMP_PROBE_TYPES }, + { "privilege", required_argument, NULL, LONG_OPT_PRIVILEGE }, + { "suppress-handler-errors", no_argument, NULL, LONG_OPT_SUPPRESS_HANDLER_ERRORS }, + { "modinfo", required_argument, NULL, LONG_OPT_MODINFO }, + { "rlimit-as", required_argument, NULL, LONG_OPT_RLIMIT_AS }, + { "rlimit-cpu", required_argument, NULL, LONG_OPT_RLIMIT_CPU }, + { "rlimit-nproc", required_argument, NULL, LONG_OPT_RLIMIT_NPROC }, + { "rlimit-stack", required_argument, NULL, LONG_OPT_RLIMIT_STACK }, + { "rlimit-fsize", required_argument, NULL, LONG_OPT_RLIMIT_FSIZE }, + { "sysroot", required_argument, NULL, LONG_OPT_SYSROOT }, + { "sysenv", required_argument, NULL, LONG_OPT_SYSENV }, + { "suppress-time-limits", no_argument, NULL, LONG_OPT_SUPPRESS_TIME_LIMITS }, + { "runtime", required_argument, NULL, LONG_OPT_RUNTIME }, + { "dyninst", no_argument, NULL, LONG_OPT_RUNTIME_DYNINST }, + { "benchmark-sdt", no_argument, NULL, LONG_OPT_BENCHMARK_SDT }, + { "benchmark-sdt-loops", required_argument, NULL, LONG_OPT_BENCHMARK_SDT_LOOPS }, + { "benchmark-sdt-threads", required_argument, NULL, LONG_OPT_BENCHMARK_SDT_THREADS }, + { "color", optional_argument, NULL, LONG_OPT_COLOR_ERRS }, + { "colour", optional_argument, NULL, LONG_OPT_COLOR_ERRS }, { NULL, 0, NULL, 0 } }; -- 2.43.5