From 12c9c3bc9a8e6f1330f88691a3a8d9fb1f9d0ffa Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 18 Apr 2012 17:11:41 -0400 Subject: [PATCH 1/1] Fix: -n "field names" option should allow "none" - Update manpage, help, and cmd line arg parsing. - Clarify that the default behavior is "payload,context", implying that specifying -n ... overrides the default behavior. Signed-off-by: Mathieu Desnoyers --- converter/babeltrace.c | 13 ++++++++++--- doc/babeltrace.1 | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/converter/babeltrace.c b/converter/babeltrace.c index cb05891d..11c10cf8 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -123,8 +123,8 @@ static void usage(FILE *fp) fprintf(fp, " --no-delta Do not print time delta between consecutive events\n"); fprintf(fp, " -n, --names name1<,name2,...> Print field names:\n"); fprintf(fp, " (payload OR args OR arg)\n"); - fprintf(fp, " all, scope, header, (context OR ctx)\n"); - fprintf(fp, " (payload active by default)\n"); + fprintf(fp, " none, all, scope, header, (context OR ctx)\n"); + fprintf(fp, " (default: payload,context)\n"); fprintf(fp, " -f, --fields name1<,name2,...> Print additional fields:\n"); fprintf(fp, " all, trace, trace:domain, trace:procname,\n"); fprintf(fp, " trace:vpid, loglevel.\n"); @@ -145,6 +145,7 @@ static int get_names_args(poptContext *pc) char *str, *strlist, *strctx; opt_payload_field_names = 0; + opt_context_field_names = 0; strlist = (char *) poptGetOptArg(*pc); if (!strlist) { return -EINVAL; @@ -161,7 +162,13 @@ static int get_names_args(poptContext *pc) opt_header_field_names = 1; else if (!strcmp(str, "payload") || !strcmp(str, "args") || !strcmp(str, "arg")) opt_payload_field_names = 1; - else { + else if (!strcmp(str, "none")) { + opt_all_field_names = 0; + opt_scope_field_names = 0; + opt_context_field_names = 0; + opt_header_field_names = 0; + opt_payload_field_names = 0; + } else { fprintf(stderr, "[error] unknown field name type %s\n", str); return -EINVAL; } diff --git a/doc/babeltrace.1 b/doc/babeltrace.1 index 3f0160ca..db07cafa 100644 --- a/doc/babeltrace.1 +++ b/doc/babeltrace.1 @@ -50,8 +50,8 @@ Debug mode (or set BABELTRACE_DEBUG environment variable) Do not print time delta between consecutive events .TP .BR "-n, --names name1<,name2,...>" -Print field names: (payload OR args OR arg), all, scope, header, -(context OR ctx), (payload active by default). +Print field names: (payload OR args OR arg), none, all, scope, header, +(context OR ctx), (default: payload,context). .TP .BR "-f, --fields name1<,name2,...>" Print additional fields: all, trace, trace:domain, trace:procname, -- 2.34.1