From patchwork Sat Jun 3 07:34:15 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: 9763941 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 728C060363 for ; Sat, 3 Jun 2017 07:34:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63DE82849A for ; Sat, 3 Jun 2017 07:34:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58C21284EE; Sat, 3 Jun 2017 07:34: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 0216B2849A for ; Sat, 3 Jun 2017 07:34:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750939AbdFCHec (ORCPT ); Sat, 3 Jun 2017 03:34:32 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33859 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750765AbdFCHec (ORCPT ); Sat, 3 Jun 2017 03:34:32 -0400 Received: by mail-wm0-f65.google.com with SMTP id d127so21985357wmf.1 for ; Sat, 03 Jun 2017 00:34: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=P9DGv6sFQK9v3pd6WTWoU4agFay7QTqmLjHCam5RZU0=; b=rBd2W82CnhiEj+cExUWOw/NbqcIVYDR1a+m3sGZNELu06INOri92B2A/mmBDvXs+iT vS8MR46o5PALXRPP00/ZrLGS0ezzu9z5m2CHCSMMlwerJtcpQMhKDVHO5UVhs/wbl0fJ Hhbw8thczsCPpnGhq2lpZufRInu/MwLWARgThE/lW2SXUlVkpaSz2TQOC0xdfiKlxZnB /3XRdVIImXPFmdoBGas1iZxDOCFD3uxIga+16I4WqgKDIQyUs7aeh5MW4TXSOEUPjTe9 XtZUgfiVPsWzvGreEgSeCTH05vni8TUx1KvS5R+cwuHW9SJSj/6n/qgdVAnrnwTynbRn Vc4w== 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=P9DGv6sFQK9v3pd6WTWoU4agFay7QTqmLjHCam5RZU0=; b=PdCA+FQ2aobfoQsYQ+bWEAcxxZCckgwAcmbpG8s3bhIfMVBmjatZnjAwnacGOLmuKp 5tSIuDhElaEkChXafYfnm1dZm8x8gDUKZFxHviRlpPN96wtGUrj9+wpWX57rZHjfgwuK AkMjNDA+ak8i7xZPk/0il+RBpL/MIlWUBDp+bG0ulCNCUKcuB/SnKbSm024gHdOQ7nFS pKQZ6WfJD3nM2l/3oNOBijGnqYkkN/MNLo/8OKICNEzJMbkVbl1G5HwS0rkW9H7ltI3T vGRqT7qbi9cZZ98vzWBPqRDvYKqRq2jO6gwqqMTR5FZ/sEuzJWL2gcU44c9lyLaNq0Xf NSLg== X-Gm-Message-State: AODbwcCusMBxx0gMX3CyIzwHniFHXMRsQvN89GS1NDPW3xn9OlF6YxxU aVmQ5FRubx3aNiztBRQ= X-Received: by 10.80.143.166 with SMTP id y35mr8736789edy.40.1496475270656; Sat, 03 Jun 2017 00:34:30 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:89c:5400:65b4:e9ec:d7a6:723a]) by smtp.gmail.com with ESMTPSA id c47sm11006585ede.32.2017.06.03.00.34.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Jun 2017 00:34:30 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Chris Li , Luc Van Oostenryck Subject: [PATCH 2/3] let handle_simple_switch() handle an array of flags Date: Sat, 3 Jun 2017 09:34:15 +0200 Message-Id: <20170603073416.66808-3-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170603073416.66808-1-luc.vanoostenryck@gmail.com> References: <20170603073416.66808-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, 19 insertions(+), 13 deletions(-) diff --git a/lib.c b/lib.c index 569c00e97..a38a6f622 100644 --- a/lib.c +++ b/lib.c @@ -458,7 +458,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, unsigned int n) { int val = 1; @@ -468,9 +473,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 (; n--; flags++) { + if (strcmp(arg, flags->name) == 0) { + *flags->flag = val; + return 1; + } } // not handled @@ -488,10 +495,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 }, @@ -703,19 +707,21 @@ 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, ARRAY_SIZE(fflags))) + return next; + if (!strncmp(arg, "tabstop=", 8)) return handle_switch_ftabstop(arg+8, next); if (!strncmp(arg, "dump-", 5)) return handle_switch_fdump(arg+5, next); - - /* handle switches w/ arguments above, boolean and only boolean below */ - if (handle_simple_switch(arg, "mem-report", &fmem_report)) - return next; - return next; }