From patchwork Wed Aug 23 20:15:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 9918271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 872FC602CB for ; Wed, 23 Aug 2017 20:16:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A6D528A2C for ; Wed, 23 Aug 2017 20:16:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F74828A2E; Wed, 23 Aug 2017 20:16:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2121A28A2C for ; Wed, 23 Aug 2017 20:16:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932665AbdHWUQc (ORCPT ); Wed, 23 Aug 2017 16:16:32 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35911 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932443AbdHWUQb (ORCPT ); Wed, 23 Aug 2017 16:16:31 -0400 Received: by mail-wm0-f66.google.com with SMTP id f127so640254wmf.3 for ; Wed, 23 Aug 2017 13:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Jcm+7mxvHEdu659AFfe7jPZ+La6VwwjcytVU6rujlb4=; b=LSSXj/UyedyCdRYKwqxwQy5S4fUXgtD8qor8Bphi1TeIV9nC3gXaghney3FlSIKJr8 0LTijNxnqcLsszb2R3n7kWdBANeshWrRsqB3hz717JACW/USZkqqKdT8xVEZ5nJZs+z1 JIObIWFow8KBlSQljSvQmkxZF1CVpcJ6SwLhfhRSF/bLdQ7qiF22LCYZCcZjh1pPUE2r 0OpRQ0c5nYfRvvYmdHxmH3MjdfwCIDS3+hbOTt/xkM70fGFzhUJe+/Z2+BhWIGz1Jsck WjIleQuSCl0nQvY6W3oyFAovNGaUhuUPzgVClUSfZ5oMIhK8tZKI/iKGD46QXowVHLaY idlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Jcm+7mxvHEdu659AFfe7jPZ+La6VwwjcytVU6rujlb4=; b=R/9IX+62iWPS2KVk6XpuLH7WqNuAIFtslbwBAYvkVyRKWCi0dAsTYpZegth23UEzhW JyQt+KUcfjW4qqThHSw5o8GWeE/A53H/c2hgozPhVJT/yITI0PyallftGqrwdhhwHrPQ 0YjxzEcl5DgyvB6FEo8oU/a4I6L7r5U7irLnSa3moNyXRKVa/vFQhS+OzMwoDir714YC XDdTH7KSQ9hDsdZ+KmniW4ao8UCsH5Akq6UwMZYUKhN/GZNc5OB1I1Rp6Xb37Rl4rqZR zEXBFgbQmO72xpqNHcfwbYq/14R+nuE7ES5ucU2X3dtovTRY9mZ+a0OiR4J+aEAf/K6O yotA== X-Gm-Message-State: AHYfb5jeqk3OJNcF2hJ3F9ncCXhRVtJjFCYUZjfPd+4hL3ZLbgOguZV4 G9evgv9aZco8Wj9YhRE= X-Received: by 10.80.144.11 with SMTP id b11mr4050354eda.24.1503519390521; Wed, 23 Aug 2017 13:16:30 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:4076:600:9020:103b:7912:3a40]) by smtp.gmail.com with ESMTPSA id e29sm1183374edd.88.2017.08.23.13.16.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 13:16:29 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [RFC PATCH 16/48] let handle_simple_switch() handle an array of flags Date: Wed, 23 Aug 2017 22:15:22 +0200 Message-Id: <20170823201554.90551-17-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170823201554.90551-1-luc.vanoostenryck@gmail.com> References: <20170823201554.90551-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This was used to handle a single flag but we need something more compact when we need to handle several flags. So, adapt this helper so that it now takes an array of flags instead of a single flag. Signed-off-by: Luc Van Oostenryck --- lib.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/lib.c b/lib.c index f847d1aba..c46798d0f 100644 --- a/lib.c +++ b/lib.c @@ -476,7 +476,12 @@ static void handle_arch_finalize(void) } -static int handle_simple_switch(const char *arg, const char *name, int *flag) +struct flag { + const char *name; + int *flag; +}; + +static int handle_simple_switch(const char *arg, const struct flag *flags) { int val = 1; @@ -486,9 +491,11 @@ static int handle_simple_switch(const char *arg, const char *name, int *flag) val = 0; } - if (strcmp(arg, name) == 0) { - *flag = val; - return 1; + for (; flags->name; flags++) { + if (strcmp(arg, flags->name) == 0) { + *flags->flag = val; + return 1; + } } // not handled @@ -506,10 +513,7 @@ static char **handle_switch_o(char *arg, char **next) return next; } -static const struct flag { - const char *name; - int *flag; -} warnings[] = { +static const struct flag warnings[] = { { "address", &Waddress }, { "address-space", &Waddress_space }, { "bitwise", &Wbitwise }, @@ -737,10 +741,18 @@ err: die("error: unknown flag \"-fdump-%s\"", arg); } +static struct flag fflags[] = { + { "mem-report", &fmem_report }, + { }, +}; + static char **handle_switch_f(char *arg, char **next) { arg++; + if (handle_simple_switch(arg, fflags)) + return next; + if (!strncmp(arg, "tabstop=", 8)) return handle_switch_ftabstop(arg+8, next); if (!strncmp(arg, "dump-", 5)) @@ -748,10 +760,6 @@ static char **handle_switch_f(char *arg, char **next) if (!strncmp(arg, "memcpy-max-count=", 17)) return handle_switch_fmemcpy_max_count(arg+17, next); - /* handle switches w/ arguments above, boolean and only boolean below */ - if (handle_simple_switch(arg, "mem-report", &fmem_report)) - return next; - return next; }