From patchwork Sun Dec 3 10:25:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2169369vqy; Sun, 3 Dec 2023 02:26:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IFo8+g+9AG2Ew0WTsdh1BOz0p4vvRpeloyzFo04cybQyCj3PjZ73sWxoAIIH1+6eFLP6s6W X-Received: by 2002:a05:6a00:b82:b0:6ce:2731:47c3 with SMTP id g2-20020a056a000b8200b006ce273147c3mr1981547pfj.35.1701599198644; Sun, 03 Dec 2023 02:26:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701599198; cv=none; d=google.com; s=arc-20160816; b=U1X8V/LgM2ijy4q32tiaxfcmrfIxs5a2xB13qNKBGIlurEXuuH7WasWssEfAkNKLZv AmCA2N9ogSSMYg6A4f4HOTrWIpDRf7zVjwqVPll0O52XP5uyoJnuvjhmB5laNFXR0KCn KO0jPBIeK+MvEfetUrBjUQJE3UlxtJ7/Th1qU6u2LD19kqb6eEvS+1McyvVI6XX3JKKt cqiSaIKQIW8Oi9OMgtI8LeYuvUuGP1cM4i6LWYAnqbrkLT5Rfm7MCvuIzhmvJ85cxKx9 Dpvj3XTlQjzFIMHLHqVRtLrWMiTW+uYQcaC9xsudtbSOuROUfY7EdL/V/IwlN+bpqTn5 g1IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gUO0ZzjxthratAhe9UbCPWlArJlF2O2aUgkgw0uZR6o=; fh=cr2kAYujDVm2vUVjNQU/xxltWJfGGL3pZvB2q4ufDBk=; b=ZwYMfszVEBSfyN/qS9DkZt/2eFxXBBcRd9qktL5QcK9s8vZy9NYx7TIKpC96/na1vT GZq/kIdsbMrEUKMoJ4vsgZWwtXCXUylESQn5o/usEuI7paSGAtICkN8SoeF+IYXRm2ZU vFhnPNnCsmikj0x+1DS+0/tdKIXwePHy8GshE3JLSr8vXMXK1fbZOlzvKeiw/ZptbNn9 3H7uNxxOa7dTm4j9wCCbyPtFrIxDM6wHnSHiyqjqSzdh12THJkMtB8irZiILBGZ/b/cH QIC4AbIaH2sfqPd9tgykazNVFq8RKH7m80Xf9J1gOZoJmHPlcvKOrrvdv7kp+WPk2Wk+ yS4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JDdpwq8W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id dh4-20020a056a020b8400b005bd27295abcsi6408856pgb.682.2023.12.03.02.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 02:26:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JDdpwq8W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 913598097E62; Sun, 3 Dec 2023 02:26:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233316AbjLCKZa (ORCPT + 99 others); Sun, 3 Dec 2023 05:25:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbjLCKZ3 (ORCPT ); Sun, 3 Dec 2023 05:25:29 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69475D5F for ; Sun, 3 Dec 2023 02:25:35 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2763C433C8; Sun, 3 Dec 2023 10:25:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701599134; bh=Oxu1+DS1jbu9WvPR52tw/o+GCX/xwK7ZLpJvE+EAR00=; h=From:To:Cc:Subject:Date:From; b=JDdpwq8WWdLnxwYRpZ9zuiYmg7je1V5eX0RzpdTO8N9MS94+aPjZl6kTXipw/ajTu 7hCG7YIl0KC54zLsWqFKb4Inu/Rc5yXLvNlaffKW/XOT3v3NwNvd5Znz8wcTF6klIY Ra8oxlSP02YlGDXRWxIk04+YC9mP6zYbNNdQogqINcMRf1ZoHWVC+BgQ5w3dILLAzv u8kgvR89ZNQuH7vPosKXWRD9/FL9yNYzeVikUZVRI21VhdlhLizwMcx1jkT0YU9iVg 5roj9FK3BZeWDqewZ/+6zHV4urJLlmlXiGzjXumU6ES6KIfbEeN2fheXTR5Fks71UF +QCtjziFXLrkQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/6] kconfig: factor out common code shared by mconf and nconf Date: Sun, 3 Dec 2023 19:25:23 +0900 Message-Id: <20231203102528.1913822-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 03 Dec 2023 02:26:11 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784256080902657922 X-GMAIL-MSGID: 1784256080902657922 Separate out the duplicated code to mnconf-common.c. Signed-off-by: Masahiro Yamada --- scripts/kconfig/Makefile | 4 +-- scripts/kconfig/mconf.c | 54 +-------------------------------- scripts/kconfig/mnconf-common.c | 53 ++++++++++++++++++++++++++++++++ scripts/kconfig/mnconf-common.h | 18 +++++++++++ scripts/kconfig/nconf.c | 53 +------------------------------- 5 files changed, 75 insertions(+), 107 deletions(-) create mode 100644 scripts/kconfig/mnconf-common.c create mode 100644 scripts/kconfig/mnconf-common.h diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 322c061b464d..7c025f82718e 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -174,7 +174,7 @@ conf-objs := conf.o $(common-objs) # nconf: Used for the nconfig target based on ncurses hostprogs += nconf -nconf-objs := nconf.o nconf.gui.o $(common-objs) +nconf-objs := nconf.o nconf.gui.o mnconf-common.o $(common-objs) HOSTLDLIBS_nconf = $(call read-file, $(obj)/nconf-libs) HOSTCFLAGS_nconf.o = $(call read-file, $(obj)/nconf-cflags) @@ -187,7 +187,7 @@ $(obj)/nconf.o $(obj)/nconf.gui.o: | $(obj)/nconf-cflags hostprogs += mconf lxdialog := $(addprefix lxdialog/, \ checklist.o inputbox.o menubox.o textbox.o util.o yesno.o) -mconf-objs := mconf.o $(lxdialog) $(common-objs) +mconf-objs := mconf.o $(lxdialog) mnconf-common.o $(common-objs) HOSTLDLIBS_mconf = $(call read-file, $(obj)/mconf-libs) $(foreach f, mconf.o $(lxdialog), \ diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 3795c36a9181..5df32148a869 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -21,6 +21,7 @@ #include "lkc.h" #include "lxdialog/dialog.h" +#include "mnconf-common.h" static const char mconf_readme[] = "Overview\n" @@ -286,7 +287,6 @@ static int single_menu_mode; static int show_all_options; static int save_and_exit; static int silent; -static int jump_key_char; static void conf(struct menu *menu, struct menu *active_menu); @@ -378,58 +378,6 @@ static void show_help(struct menu *menu) str_free(&help); } -struct search_data { - struct list_head *head; - struct menu *target; -}; - -static int next_jump_key(int key) -{ - if (key < '1' || key > '9') - return '1'; - - key++; - - if (key > '9') - key = '1'; - - return key; -} - -static int handle_search_keys(int key, size_t start, size_t end, void *_data) -{ - struct search_data *data = _data; - struct jump_key *pos; - int index = 0; - - if (key < '1' || key > '9') - return 0; - - list_for_each_entry(pos, data->head, entries) { - index = next_jump_key(index); - - if (pos->offset < start) - continue; - - if (pos->offset >= end) - break; - - if (key == index) { - data->target = pos->target; - return 1; - } - } - - return 0; -} - -int get_jump_key_char(void) -{ - jump_key_char = next_jump_key(jump_key_char); - - return jump_key_char; -} - static void search_conf(void) { struct symbol **sym_arr; diff --git a/scripts/kconfig/mnconf-common.c b/scripts/kconfig/mnconf-common.c new file mode 100644 index 000000000000..18cb9a6c5aaa --- /dev/null +++ b/scripts/kconfig/mnconf-common.c @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include "expr.h" +#include "list.h" +#include "mnconf-common.h" + +int jump_key_char; + +int next_jump_key(int key) +{ + if (key < '1' || key > '9') + return '1'; + + key++; + + if (key > '9') + key = '1'; + + return key; +} + +int handle_search_keys(int key, size_t start, size_t end, void *_data) +{ + struct search_data *data = _data; + struct jump_key *pos; + int index = 0; + + if (key < '1' || key > '9') + return 0; + + list_for_each_entry(pos, data->head, entries) { + index = next_jump_key(index); + + if (pos->offset < start) + continue; + + if (pos->offset >= end) + break; + + if (key == index) { + data->target = pos->target; + return 1; + } + } + + return 0; +} + +int get_jump_key_char(void) +{ + jump_key_char = next_jump_key(jump_key_char); + + return jump_key_char; +} diff --git a/scripts/kconfig/mnconf-common.h b/scripts/kconfig/mnconf-common.h new file mode 100644 index 000000000000..ab6292cc4bf2 --- /dev/null +++ b/scripts/kconfig/mnconf-common.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef MNCONF_COMMON_H +#define MNCONF_COMMON_H + +#include + +struct search_data { + struct list_head *head; + struct menu *target; +}; + +extern int jump_key_char; + +int next_jump_key(int key); +int handle_search_keys(int key, size_t start, size_t end, void *_data); +int get_jump_key_char(void); + +#endif /* MNCONF_COMMON_H */ diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index 8cd72fe25974..1148163cfa7e 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -12,6 +12,7 @@ #include #include "lkc.h" +#include "mnconf-common.h" #include "nconf.h" #include @@ -279,7 +280,6 @@ static const char *current_instructions = menu_instructions; static char *dialog_input_result; static int dialog_input_result_len; -static int jump_key_char; static void selected_conf(struct menu *menu, struct menu *active_menu); static void conf(struct menu *menu); @@ -691,57 +691,6 @@ static int do_exit(void) return 0; } -struct search_data { - struct list_head *head; - struct menu *target; -}; - -static int next_jump_key(int key) -{ - if (key < '1' || key > '9') - return '1'; - - key++; - - if (key > '9') - key = '1'; - - return key; -} - -static int handle_search_keys(int key, size_t start, size_t end, void *_data) -{ - struct search_data *data = _data; - struct jump_key *pos; - int index = 0; - - if (key < '1' || key > '9') - return 0; - - list_for_each_entry(pos, data->head, entries) { - index = next_jump_key(index); - - if (pos->offset < start) - continue; - - if (pos->offset >= end) - break; - - if (key == index) { - data->target = pos->target; - return 1; - } - } - - return 0; -} - -int get_jump_key_char(void) -{ - jump_key_char = next_jump_key(jump_key_char); - - return jump_key_char; -} static void search_conf(void) { From patchwork Sun Dec 3 10:25:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172930 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2169338vqy; Sun, 3 Dec 2023 02:26:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IGd5gvAhyX9iceIiqVvlzFZ4yLdcD6O2/6QKAjn0gxbDmg0MxSozdz3Ne0nT19uzF7ejhUA X-Received: by 2002:a05:6a00:2d9a:b0:6ce:4623:ef99 with SMTP id fb26-20020a056a002d9a00b006ce4623ef99mr834783pfb.43.1701599192219; Sun, 03 Dec 2023 02:26:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701599192; cv=none; d=google.com; s=arc-20160816; b=L+V30GZPGq/Pt1FgAhY2CaTC/7bBb2/Axp9LYdx/Fln34UClsxUmNcSscOBmuiYIY2 +JOGKGVXZq0mukWklgUoEoZLqipKlR5JSWNVENZFMoJRYxSiS54kt1AJImYvcbsULceT ESjMzq5GNuZliEq/VkCAbe0CH45OFWH4XGzsrESD/HYznwkVnco4PdUQIVHz70224oYC tki+JenQLZidQ3mgtGb089glh5acsd5ABi205fzUHqD6Bo0FMW7aAduTMcrD+hSnmM7W SrNWxU89zxnGiv9vUcWF/UQdqF1/+YudZl03Td/nbmtWlHSmtGqJnKCcWz7E4PMTc+d2 PbZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YG0Dd+YFYkXs7folL3oup8roevIq/V+Tk4xFC4WqY94=; fh=cr2kAYujDVm2vUVjNQU/xxltWJfGGL3pZvB2q4ufDBk=; b=HNKhUEU7rnqAmTxDwWubaE649muYkP2TBYcYN9CwzMfdtvDposk9m2x3t9M6achLe8 HLHpOsQ7szSCblfciGoOiLK21wSsWwib5ISS6lPaU2IDxb6vrMqVJivw++FQQzcdpA8n pcdtRdPodgzS+EY30aeETdDqbXIeacCLdm+vlWJMB/AnX0htK67SnVe8dXSzaXodZ4xS /H4OOR6Vo6njrSdCsMsdvUxHirFZ96KZzpnelTByhT00BvTpqcD8Cr4PC58lgyk7BIf+ hSHx2iBG9iLXSY0+LIV06LqfUr3haUx2GrwLtpz8I/F62DgeeOBZsUTHGK3P8EHK44n1 KAzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=e0F0Nnyp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id bd9-20020a056a00278900b006bd360e70edsi6225413pfb.103.2023.12.03.02.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 02:26:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=e0F0Nnyp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 7D221807C7F8; Sun, 3 Dec 2023 02:26:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233349AbjLCKZb (ORCPT + 99 others); Sun, 3 Dec 2023 05:25:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbjLCKZ3 (ORCPT ); Sun, 3 Dec 2023 05:25:29 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3A6A10E4 for ; Sun, 3 Dec 2023 02:25:35 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF795C433CA; Sun, 3 Dec 2023 10:25:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701599135; bh=5SBYjvSXCCi361BUF6jW6e0HVe2sXM0i9kXYxAiDfG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e0F0Nnyp3WZmkSirOGw6DV/AN4cIC1JcR0C8H9SZRzwHSlALHuz+2Bnoepfd8ypx+ VW/Q0aG5avI60eQyeSm469rI3VsIP7VpiQwldFz3FKqr7zRQZCtutd6za0np9Babm4 SRV2eCNl2eh9VVmniqMoUJfFeFLMl3dPnoFpVmJu3Af3uC9TiUme7eVkZKcFJtmcsC dnnXI6gceb5k620eQCgygAiExRPYv3zLiAtKtEPot1LVpdF1fYL7xZIL/YxoENVrY/ kljsBARO72ssfdQ4CReLXWLOp2KRUghuhO+OL6bBVp/WxPyOXo9uPaH49L0iFW0Pl+ y0O1ffyelLi2Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/6] kconfig: make menu_warn() static function Date: Sun, 3 Dec 2023 19:25:24 +0900 Message-Id: <20231203102528.1913822-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231203102528.1913822-1-masahiroy@kernel.org> References: <20231203102528.1913822-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 03 Dec 2023 02:26:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784256074723714488 X-GMAIL-MSGID: 1784256074723714488 This function is only used locally within menu.c. Signed-off-by: Masahiro Yamada --- scripts/kconfig/lkc.h | 1 - scripts/kconfig/menu.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 471a59acecec..3908741edf8f 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -80,7 +80,6 @@ char *str_get(struct gstr *gs); /* menu.c */ void _menu_init(void); -void menu_warn(struct menu *menu, const char *fmt, ...); struct menu *menu_add_menu(void); void menu_end_menu(void); void menu_add_entry(struct symbol *sym); diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 61c442d84aef..f07c0d8691af 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -19,7 +19,7 @@ static struct menu **last_entry_ptr; struct file *file_list; struct file *current_file; -void menu_warn(struct menu *menu, const char *fmt, ...) +static void menu_warn(struct menu *menu, const char *fmt, ...) { va_list ap; va_start(ap, fmt); From patchwork Sun Dec 3 10:25:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172932 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2169373vqy; Sun, 3 Dec 2023 02:26:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IEQVXROcVwWWmmCbltsIMLdp0mgPQI+HDniyNUkK46A3XE03EZd70gD6IB0ZqOovPSzTQXF X-Received: by 2002:a17:902:b087:b0:1d0:6ffd:9e2c with SMTP id p7-20020a170902b08700b001d06ffd9e2cmr2218782plr.126.1701599199486; Sun, 03 Dec 2023 02:26:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701599199; cv=none; d=google.com; s=arc-20160816; b=TromkCT/Ck3pZAcFGbXi0a/Z+Varauk0RiGW3ngiSkJnGVdhZLi8JH8VAC04Wrm2F8 +2lPCqJRf1ipvO5FluGoPHAeWwUS1vtj3Ip2qd1Vey6icYasT0khSaLOKDhEDjky7UDn DnCi6fna1bbxfialSsg98KUPT7MrLtjprv2tb7F3t/yzAxeHI6zzE0Uxl71iaE3MwaZ7 H+pWjkEhe1juMXgBvSdVPi2ig9tgrTLnzEhUDecMyBaaicHNSWiQ5cMNnGCyqjIy0QoA PIEd9/mOzGuXVdxk/h2sHwHh8PMbellZMFw18OotaxMOixqychjiwOdUX8e5FwcAmvbr RVOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cF7qznDyv4bFuGAO5QjteErqkp5DFh1Bul0RFVzttEQ=; fh=cr2kAYujDVm2vUVjNQU/xxltWJfGGL3pZvB2q4ufDBk=; b=QJ9vPrevsbQpKuR53wn0Idf/QcmKiMdbMT+J0Z/d9ixZiHvMSWZYWRS2sGEc1ojZGv vXsGW2zJ1Og9Y/8/a+XiKVCJeK+dy1GDdfbb9Q9JFV4xY8cvmsYx38UrjWqJVFbNLBkm LI4KnHQkVPqxIQ5M/JL48fr2d86zLLq2VTv8ka63y3LN2lnew6kDfPeuVfRlTLGaae8g S9aPivdx35gWuLmTIiPLPoMKym5/hvXm/rvFMGzC50R36U8sk6S/x/FCzqJexonn7f/u i2LbLUSzLKgSvpvNoIJfWcrviBVrHZxC03sNkcNWhu5hSj0VBXLGwPMo346kFSVu034y 2gqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IKMP5z88; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id i8-20020a17090ad34800b002869cf21328si527158pjx.158.2023.12.03.02.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 02:26:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IKMP5z88; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 293AF807C7F8; Sun, 3 Dec 2023 02:26:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233373AbjLCKZd (ORCPT + 99 others); Sun, 3 Dec 2023 05:25:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232339AbjLCKZa (ORCPT ); Sun, 3 Dec 2023 05:25:30 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00E08FD for ; Sun, 3 Dec 2023 02:25:36 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3ADEC433D9; Sun, 3 Dec 2023 10:25:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701599136; bh=xr4qK+/McATkt6q41PjvXqtg2z7HnzV21XZ0nlNgetk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IKMP5z88fzjGpGdCnlKyWmfF+b6BNwd1jdWHy3CARQgDPGEfpSPxyUnfveZzZ5VwM UdNtQweYYnU6E3R/t065Yy5ssR4Tq0SxW6QpO2BrYfCw5wLLESe+zeFWdchcUeuamd B2OL01AOAjKwc0YuwrDp6JoyzwM+V/CxQaWHd/GWLsNILwoWY0B9LWe7Z2GS3DR88V /zg7o0LV9bRcP7TGcbx1Nlgk4jHttWPlPbenCYOgQvxPCvz9/orfaZUdrkfK6jsGjH mgNJolZleOnXZv+ScCdbIdkw5UTpq3eN/ZZ/dgZu7mZXRVYew2EtZ3PjIOvNQhrzFC y81wxIlKhNtsg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/6] kconfig: squash menu_has_help() and menu_get_help() Date: Sun, 3 Dec 2023 19:25:25 +0900 Message-Id: <20231203102528.1913822-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231203102528.1913822-1-masahiroy@kernel.org> References: <20231203102528.1913822-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 03 Dec 2023 02:26:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784256082282041111 X-GMAIL-MSGID: 1784256082282041111 menu_has_help() and menu_get_help() functions are only used within menu_get_ext_help(). Squash them into menu_get_ext_help(). It revealed the if-conditional in menu_get_help() was unneeded, as menu_has_help() has already checked that menu->help is not NULL. Signed-off-by: Masahiro Yamada --- scripts/kconfig/lkc.h | 2 -- scripts/kconfig/menu.c | 17 ++--------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 3908741edf8f..8ca5bbc74df1 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -98,8 +98,6 @@ bool menu_is_visible(struct menu *menu); bool menu_has_prompt(struct menu *menu); const char *menu_get_prompt(struct menu *menu); struct menu *menu_get_parent_menu(struct menu *menu); -bool menu_has_help(struct menu *menu); -const char *menu_get_help(struct menu *menu); int get_jump_key_char(void); struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head); void menu_get_ext_help(struct menu *menu, struct gstr *help); diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index f07c0d8691af..dc60a9ddc5dd 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -673,19 +673,6 @@ struct menu *menu_get_parent_menu(struct menu *menu) return menu; } -bool menu_has_help(struct menu *menu) -{ - return menu->help != NULL; -} - -const char *menu_get_help(struct menu *menu) -{ - if (menu->help) - return menu->help; - else - return ""; -} - static void get_def_str(struct gstr *r, struct menu *menu) { str_printf(r, "Defined at %s:%d\n", @@ -856,10 +843,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) struct symbol *sym = menu->sym; const char *help_text = nohelp_text; - if (menu_has_help(menu)) { + if (menu->help) { if (sym->name) str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); - help_text = menu_get_help(menu); + help_text = menu->help; } str_printf(help, "%s\n", help_text); if (sym) From patchwork Sun Dec 3 10:25:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172933 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2171224vqy; Sun, 3 Dec 2023 02:33:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IGamRgiyq7BaobpImAkD5E8xxD94Teg4co9rr+Vj/rN4reOAjGiM8Or3XXnJ4eegYobBGGp X-Received: by 2002:a05:6359:2a5:b0:170:17eb:9c49 with SMTP id ek37-20020a05635902a500b0017017eb9c49mr2272251rwb.42.1701599623226; Sun, 03 Dec 2023 02:33:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701599623; cv=none; d=google.com; s=arc-20160816; b=pmD5Kt5q388txmCAgMp9n/mzhuFIheEOnSPkq/xWLLY+CMuMQj0A3NbvEEIBeNCwpc ubQ9TCvHNzilsPXMvQEnpmPm/OkBy86LJXS2euhK394MV+0pwzVbSgb8n6YoV3R9yXy5 gHny2f0xGoBr7yVkjXAnzhoYypJsepFEVxb/KQMHBsvnMjHO0tmnRhNSitO7TWTiT737 +h8TXT5+ajXqwpkWhuf14Ztwp6JeOtezBolKr1xS3U5BBmc6j/JG8n2UYBnu53PSWt12 rNHs4U/lekyD5sW4Ovh3qvTYVzyftZpUC+7wDvhA7l0Ah4jAWPBvLBcWVahs8EtUyo1e xH7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=M+NbK6ie26kCbvLco/acZq0A0SsKJTpBg3jyoNuul6M=; fh=cr2kAYujDVm2vUVjNQU/xxltWJfGGL3pZvB2q4ufDBk=; b=BWLbfv0IE7zG9VHwSkvanj0UaE2XstJb5GKnn+h3CWw5J/flWv5mfFJ7C+1d8yOZmb L3lSK7+R5TJnmbitNFQ8bLQPThtlzJ/KE+Msu2glECi1z7u61C/itoQfyID8CbxqaNSE e8pe+G8BHgBiZk58k6OLMxsHgKLDDFXTiHX40sM6XiTskQoUqDpC34M8MD5brknbG5Eo MZU9FcX15k7FDY5irdBi87N2PbRVJk/cyq5Nw3waywYY8/LV60aSnFFMZvztZt6bdzvt +5iJCVQXJJyK0FWbjE7TmlNPIdXi0nm2QuvdFZJsYYWbrE9oBtCrrDTGJW8/Uj1LsowD 23eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Vj+fwQJa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id z5-20020a170902708500b001cf75ba66e6si5807884plk.580.2023.12.03.02.33.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 02:33:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Vj+fwQJa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id EBCF5808E669; Sun, 3 Dec 2023 02:33:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233627AbjLCKZ7 (ORCPT + 99 others); Sun, 3 Dec 2023 05:25:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233337AbjLCKZb (ORCPT ); Sun, 3 Dec 2023 05:25:31 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED1B5FD for ; Sun, 3 Dec 2023 02:25:37 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E37B6C433C9; Sun, 3 Dec 2023 10:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701599137; bh=LEoTggARida+p4FLdOShzFKl4z7iyh9a/kviqyZ5sDY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vj+fwQJayDbwrfs2+Hs+St+PCRLNFFY8IDpG2/4YAkzdbMeKDiNE472eFVcZw9Ezc 8dFreVRKLo4w6cAS8YUWeD8Q92tyUA7fF+4vmeD+tp9Pzd/2JYLtyAcWG4Vi7dd7q5 Qw2tFWn2qqxLJB010d/eYVy7dmWHsiiDWPVo/wVZkEXeCrao3W+CWHYlvy+KP4uYBo rBmOYjV9W3U81PjmHHKkfWalzGcrmgKwg+163ciOjhohFHK2CKezf6disP4A5fO0Zr Dcvuxr5j0gFQrcaoH/RrWS+V+5IgjaI5RFJCcZ0pXh7a0UTdqBjaZZZEKW+ERKZcjp 1dW9m6ivPmmPw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 4/6] kconfig: add include guard to lkc_proto.h Date: Sun, 3 Dec 2023 19:25:26 +0900 Message-Id: <20231203102528.1913822-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231203102528.1913822-1-masahiroy@kernel.org> References: <20231203102528.1913822-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 03 Dec 2023 02:33:41 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784256526581573424 X-GMAIL-MSGID: 1784256526581573424 Signed-off-by: Masahiro Yamada --- scripts/kconfig/lkc_proto.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index edd1e617b25c..687d8698d801 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h @@ -1,4 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#ifndef LKC_PROTO_H +#define LKC_PROTO_H + #include /* confdata.c */ @@ -50,3 +53,5 @@ char *expand_one_token(const char **str); /* expr.c */ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken); + +#endif /* LKC_PROTO_H */ From patchwork Sun Dec 3 10:25:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172934 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2171235vqy; Sun, 3 Dec 2023 02:33:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IHrlro1p8g5gYdNaUXn87a/xkvpfpwdrtFxB1lemWOL+p22a3hx/7ULyisa1eFsa0QC/uuI X-Received: by 2002:a92:906:0:b0:35d:59a2:1288 with SMTP id y6-20020a920906000000b0035d59a21288mr2673207ilg.52.1701599624930; Sun, 03 Dec 2023 02:33:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701599624; cv=none; d=google.com; s=arc-20160816; b=RhiN3Fi7oxpUNtabJ0RLIZvZ/3oa5OZRhu2oQ5OUCKfT6BvwE7+pmsyEbkQZB80Vf5 rCzOVNxEoXMIcvdCHmYiYiiJd/liqBuYeLUlS1EAL5TeT2Zvxg+qqVMbFz9m7lftOYvT qFxKs99O2NsMsMx10JFEP3hh2Wuey7wxmg2aAVPyeVIjIeVmUlG0mUGEkonyF5H1fU+B 4f+r24gBgQedUFYLfzp/5VP25pTwPdsZlGoZ7wipJsQRfEs2LUGMcuWSwFYO9ri/8D22 /IsiIoeE8/0onRDUsFK+Ed053AjHozmcJ4cLGfSkxbLm4/QS9rbP/L8Bj9PCDIF467qF 5xOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=365eWpfeHkkklEzJDCWG+EmJSwHtvKzfRiappZVU1+g=; fh=/VXJ9mQC5EidFoRkVyS7RHlOAS3WC354b2PL2hFG5ks=; b=WcIZ1jasnNRIbfdnRgG3JI78DdF6BEM96Vmp0CWwERALt580y/xzp7rxRhSz9AAcI2 YVMtf/61JI2g2hbaNu/96PZbxYXg3UanTrTHr/rOEUKKFSHaTv5uzREeYOlprVdVNBff YDVU/A2cAiXm3UFM231nmH08Z1ltJUM28z7EWGXhb3PRbp/dc7470Mln4ECWmOURHkNg D5Sn8V0GM/F3oM01KcaIAw775yclwHjmOBXzkPuhxBhZk078HoBG9L/7ABmLi1DE7yqD Y2HxB1IZASSQIL2BM1ueIKNZDzl1GT8JjfW3s2g0FORPBCAyL1o21IrI2UF1/HUwHQXt zpEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ru11GhM8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id a8-20020a170902ecc800b001d06d5f9ad1si2576998plh.59.2023.12.03.02.33.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 02:33:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ru11GhM8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 976D48089E7F; Sun, 3 Dec 2023 02:33:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233643AbjLCKZ7 (ORCPT + 99 others); Sun, 3 Dec 2023 05:25:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233366AbjLCKZc (ORCPT ); Sun, 3 Dec 2023 05:25:32 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C8E8FD for ; Sun, 3 Dec 2023 02:25:39 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08552C433CA; Sun, 3 Dec 2023 10:25:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701599139; bh=/G/U1jJhbg6VKWyteRfH6C1mvYApP8yrSi62PoEqI9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ru11GhM84CbNOelG13KOP1EoEqrb8+Wvlvslrb7HO888VE7rXPv8gGZNWGla1cS2c /vzIfuDA7nv5eCPMlO/dUbAT1l2/8dSPRLuyq1q7qHSx6xZU4pyZRzeXpOABc7hasb GrVzvInmpj19XxroKZTs8Ulwp20rJyHa6ejUCPLhjztl7s4S7SIoesFrougAlvMqis O+DVF79EGrgNWxMnJF37ZTdwifA++f2ylh+huqAlQCjyc+QT5Bvv9yKHhzV2r/Qq1o P9pt2ypmlUV9rXAv/HTjBE1K+VhMnBe13AzN8iEBtsT7aMWQxBNKYvn3qlollSvI3v IAswBND4PDQnw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH 5/6] kconfig: remove unreachable printf() Date: Sun, 3 Dec 2023 19:25:27 +0900 Message-Id: <20231203102528.1913822-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231203102528.1913822-1-masahiroy@kernel.org> References: <20231203102528.1913822-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 03 Dec 2023 02:33:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784256528452709543 X-GMAIL-MSGID: 1784256528452709543 Remove the unreachable code detected by clang. $ make HOSTCC=clang HOSTCFLAGS=-Wunreachable-code defconfig [ snip ] scripts/kconfig/expr.c:1134:2: warning: code will never be executed [-Wunreachable-code] printf("[%dgt%d?]", t1, t2); ^~~~~~ 1 warning generated. Signed-off-by: Masahiro Yamada --- scripts/kconfig/expr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index 81ebf8108ca7..a290de36307b 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -1131,7 +1131,6 @@ static int expr_compare_type(enum expr_type t1, enum expr_type t2) default: return -1; } - printf("[%dgt%d?]", t1, t2); return 0; } From patchwork Sun Dec 3 10:25:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172935 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2171259vqy; Sun, 3 Dec 2023 02:33:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IGquUpU8+BTRp9LBkyoSuVb9jmvX9OXOArgfwMk+tByYNfC3aOXCtpPc0uqCD+B93zAGkBx X-Received: by 2002:a05:6870:ed88:b0:1fa:fb9b:bfec with SMTP id fz8-20020a056870ed8800b001fafb9bbfecmr3314729oab.39.1701599632766; Sun, 03 Dec 2023 02:33:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701599632; cv=none; d=google.com; s=arc-20160816; b=DeP66MKtitfvzKQjjyfCovGFR6UUYda7aZTxBOP0Ny7qh3rzJqkEYoNzxw0bITgdRd kXJel0FZejDv8kh+8O6pGw/QyvOkqVoOHn94Tvc49bYUJq5dfoMe2yHAa20gAFSLGddA AGubFNUNWoMz4zAaN7A3RrWm6+Fq5hjOVgtVpD33KLj1lDpFSv6R8OtO/1j7aPtK8Sk7 q7b7s8YpTgcg9q7Sj3gs4T85sUfsn2bK2aDDbG58U+RmOQ3ZkR/f9VkRZXeiaXMHDzdp 5YZGof78VGa9iVU6kcDeU4e/nW/24z1xGwoAP4vO8yXjKHFVmNfoUGHImutoatCzptl6 Rr8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3aWUdQXal6pJFEiTmEPl2WeIPqTL23ctFHVRMMTYTwM=; fh=cr2kAYujDVm2vUVjNQU/xxltWJfGGL3pZvB2q4ufDBk=; b=XW0u2VfSiL98zUR9Mq8iIuCj6SV9RphY2R1YeptsL8S20uSQ8LdNlU/uu6LNxUnaA+ 9nwGAg3St/ZSASKaPg5JCO4lSDVIe0TK3AYjfn/IMDV1bl+hGsP/sG0xj8t3rqxUPHUH SkqlOJwPwYlIJGROBde9hqK6vC6jr7/SaCQSKo+UjZezCYFm3k7x5cGMOejWKXWZqG5+ jU0ChKA8cUsAXBCshwoQekFnYBJJtTBvpgP5sTtOp3a2T/u2eJuMCvoKjOBD/Z7BNuh0 BJvwpJwT1JDxFVPCGqlJlGBSIxLzSgbFR+XDsckyH+PRBSe3obRAk51Yk15c8ys+3bjj mNwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cO6Viyxe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id v13-20020a655c4d000000b005be264316d6si5945002pgr.598.2023.12.03.02.33.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 02:33:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cO6Viyxe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 780D280B19EF; Sun, 3 Dec 2023 02:33:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233685AbjLCK0C (ORCPT + 99 others); Sun, 3 Dec 2023 05:26:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233375AbjLCKZe (ORCPT ); Sun, 3 Dec 2023 05:25:34 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A02DDFE for ; Sun, 3 Dec 2023 02:25:40 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A04F0C433C8; Sun, 3 Dec 2023 10:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701599140; bh=Lnc3/O+6CGAEAS2bB5Go5eHeE+xwqLvuu2/DPt0BL5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cO6ViyxeBuYd4k0wYeSUZ2wRRCgCArk8SlgrIlhwtkOCQuajWRfPbcE/PA68owivB qzSGcHRasVodTIV5akKFFbHJJerXJTboGgemSWzDxbcQWyj2BEUVp6Iytzg+doS3ci ChiV5qQaogDbCC4R/vZTLgoXSxUVHmqzpD1NO94CUSyUrtvWsVnCTVXSr1m0dyFhZc XBQwGJl7icuvWAQ3CSoyGadulYrl3B8bt+pFfA4qfQmW6GmZqNF2bT9ZtuSQM3p5gB AR4QDeP2XKfr5Fe3QfTWUWV8UGFNa1FeIapCUTirBFC+D+sr6GWALN7w/7cghSoXf2 r48aKdBWseT4g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 6/6] kconfig: remove redundant NULL pointer check before free() Date: Sun, 3 Dec 2023 19:25:28 +0900 Message-Id: <20231203102528.1913822-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231203102528.1913822-1-masahiroy@kernel.org> References: <20231203102528.1913822-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 03 Dec 2023 02:33:50 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784256536282859434 X-GMAIL-MSGID: 1784256536282859434 Passing NULL to free() is allowed and is a no-op. Remove redundant NULL pointer checks. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 3 +-- scripts/kconfig/util.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index bd14aae1db58..f1197e672431 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -432,8 +432,7 @@ int conf_read_simple(const char *name, int def) case S_INT: case S_HEX: case S_STRING: - if (sym->def[def].val) - free(sym->def[def].val); + free(sym->def[def].val); /* fall through */ default: sym->def[def].val = NULL; diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index b78f114ad48c..92e5b2b9761d 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c @@ -42,8 +42,7 @@ struct gstr str_new(void) /* Free storage for growable string */ void str_free(struct gstr *gs) { - if (gs->s) - free(gs->s); + free(gs->s); gs->s = NULL; gs->len = 0; }