From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933125AbeAIPhS (ORCPT + 1 other); Tue, 9 Jan 2018 10:37:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57102 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933098AbeAIPhP (ORCPT ); Tue, 9 Jan 2018 10:37:15 -0500 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , David Ahern , Andi Kleen , Alexander Shishkin , Peter Zijlstra Subject: [PATCH 32/49] tools lib subcmd: Add OPT_INTEGER_OPTARG|_SET options Date: Tue, 9 Jan 2018 16:35:05 +0100 Message-Id: <20180109153522.14116-33-jolsa@kernel.org> In-Reply-To: <20180109153522.14116-1-jolsa@kernel.org> References: <20180109153522.14116-1-jolsa@kernel.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 09 Jan 2018 15:37:15 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Adding OPT_INTEGER_OPTARG|_SET option macros to allow optional argument with set flag. Link: http://lkml.kernel.org/n/tip-d01dcbwqvrv5762salo84105@git.kernel.org Signed-off-by: Jiri Olsa --- tools/lib/subcmd/parse-options.c | 2 ++ tools/lib/subcmd/parse-options.h | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c index f6a1babcbac4..6ba0e1bfa01a 100644 --- a/tools/lib/subcmd/parse-options.c +++ b/tools/lib/subcmd/parse-options.c @@ -250,6 +250,8 @@ static int get_value(struct parse_opt_ctx_t *p, *(int *)opt->value = 0; return 0; } + if (opt->set) + *(bool *)opt->set = true; if (opt->flags & PARSE_OPT_OPTARG && !p->opt) { *(int *)opt->value = opt->defval; return 0; diff --git a/tools/lib/subcmd/parse-options.h b/tools/lib/subcmd/parse-options.h index 92fdbe1519f6..e2edd6aada53 100644 --- a/tools/lib/subcmd/parse-options.h +++ b/tools/lib/subcmd/parse-options.h @@ -144,6 +144,15 @@ struct option { .value = check_vtype(v, const char **), .argh = (a), .help = (h), \ .flags = PARSE_OPT_OPTARG, .defval = (intptr_t)(d), \ .set = check_vtype(os, bool *)} +#define OPT_INTEGER_OPTARG(s, l, v, a, h, d) \ + { .type = OPTION_INTEGER, .short_name = (s), .long_name = (l), \ + .value = check_vtype(v, int *), .argh = (a), .help = (h), \ + .flags = PARSE_OPT_OPTARG, .defval = (intptr_t)(d) } +#define OPT_INTEGER_OPTARG_SET(s, l, v, os, a, h, d) \ + { .type = OPTION_INTEGER, .short_name = (s), .long_name = (l), \ + .value = check_vtype(v, int *), .argh = (a), .help = (h), \ + .flags = PARSE_OPT_OPTARG, .defval = (intptr_t)(d), \ + .set = check_vtype(os, bool *)} #define OPT_STRING_NOEMPTY(s, l, v, a, h) { .type = OPTION_STRING, .short_name = (s), .long_name = (l), .value = check_vtype(v, const char **), .argh = (a), .help = (h), .flags = PARSE_OPT_NOEMPTY} #define OPT_DATE(s, l, v, h) \ { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = "time", .help = (h), .callback = parse_opt_approxidate_cb } -- 2.13.6