From patchwork Sat Nov 25 16:35:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169755 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2040876vqx; Sat, 25 Nov 2023 08:36:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IELCBhK056UgHrfI5nfNzSPKxo1awFLAGNnd6u1ajJARhcsTAECVKFogxkw8EbBVvu8vpVQ X-Received: by 2002:a05:6a21:33a7:b0:187:4118:140 with SMTP id yy39-20020a056a2133a700b0018741180140mr12401370pzb.24.1700930182458; Sat, 25 Nov 2023 08:36:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700930182; cv=none; d=google.com; s=arc-20160816; b=PeGGF23z9+OAiHQER2pakBJXrjWh5h3FgiU4G0g8/r4M29ncrIeTh+fuW0Rj+wabxg VQrgxJqI1R+jG1e4i6m/50VBZF2XuuOV6bYj5YzSa+yUJVBJgv9mobCgqGngtkOhep/S ija4mcu6Qi877mcPmGDCOP0yPkqs0DWUb4Bgpxjm4x/32K850qqP8dT+TGmovoWOGSfa szMA1XMgKmTGf1+o+G7yH91fUutBghauzc1zof0yul4oP8E3VSMzDD0FLu1V43CSQYpe Zu9KOAbuLLVHpdaPl3D2R4L8jS/HImMb53fI5Gfop3SnD64KDAlMvANbaPpBzxTZqK9q 4v6g== 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=56Hbbfvq0jLTA4FAUdNbPiudGFxGeFxdQtCTK4yG8T8=; fh=cr2kAYujDVm2vUVjNQU/xxltWJfGGL3pZvB2q4ufDBk=; b=d+mcQy5PcsNaq/wqtlvBcikxf5t5btsV7Pis1BVRZRYGfdj+Q78/0VkOVY6R7sGveh SGoDK5ZvAJ68mma7DpyjjESks/c3Z7O5L5bVWzJVKecviEOV0+XpIT8zId3USNEYiXQX BNHpEKGEm8OM1gZbJTTZrOrolvR2WfHTcnEFOrKAcuGncikv0NkRUY98Lj+mEMpmrLXc h4gnMd8Hplehpr43Lgzo0pSDLVUo++w+LFbIQfR6YbhR9Fm5LiIlEV+FANN6nLE/qOiF rNFx+VoExPyqJXOsrBaKGCUvkfLrR2F6Uj2JE3wyIQUZkQEAyN+PWejzJvEohT2QJIpW oJmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FEd9SbMW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id 201-20020a6302d2000000b005b8fb1e0312si6137029pgc.248.2023.11.25.08.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 08:36:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FEd9SbMW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id E3ADA80C5C8A; Sat, 25 Nov 2023 08:36:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232412AbjKYQgJ (ORCPT + 99 others); Sat, 25 Nov 2023 11:36:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232413AbjKYQf7 (ORCPT ); Sat, 25 Nov 2023 11:35:59 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D937107 for ; Sat, 25 Nov 2023 08:36:06 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40F0EC433C7; Sat, 25 Nov 2023 16:36:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700930166; bh=fts8SLIgVhLqO6eGUFoOp3dpYL3AguZRASLqnEn6BEE=; h=From:To:Cc:Subject:Date:From; b=FEd9SbMWzCapCGVZ+4jpMWoK4eQS8yPkj94F713Q+hvBnfjHUNSl4aMHzyjFarDxC cbWR0A0f2qg2x+aJrjSHf9uucae4tP3rjxVX+CJibfWYlDppMoVUEQpooHGMjVzrD+ hpOx+u77ESqDTALTXi+AiKX4bNXeOOJdmmVDyQpt0Q2RbqJZB83a3zcbNWr+DRd8UQ EOvfhRa97GdF71iW30ywiagQ0GVbRXjmsxilOf7IE/jz0SOPW2qFCH/xP7cUch1iP/ JQ5cFbpL5norJUWwB7+PUnAuCgTEuQvmyT2a7QrfMkypcr/W3Bsea1mNkZ4gmPuSei HNafJf1OL3eSQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] kconfig: remove unneeded symbol_empty variable Date: Sun, 26 Nov 2023 01:35:58 +0900 Message-Id: <20231125163559.824210-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 pete.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 (pete.vger.email [0.0.0.0]); Sat, 25 Nov 2023 08:36:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783554566799045772 X-GMAIL-MSGID: 1783554566799045772 This is used only for initializing other variables. Use the empty string "". Please note newval.tri is unused for S_INT/HEX/STRING. Signed-off-by: Masahiro Yamada Tested-by: Geert Uytterhoeven --- scripts/kconfig/symbol.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index a76925b46ce6..f7075d148ac7 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -29,12 +29,6 @@ struct symbol symbol_no = { .flags = SYMBOL_CONST|SYMBOL_VALID, }; -static struct symbol symbol_empty = { - .name = "", - .curr = { "", no }, - .flags = SYMBOL_VALID, -}; - struct symbol *modules_sym; static tristate modules_val; @@ -346,7 +340,7 @@ void sym_calc_value(struct symbol *sym) case S_INT: case S_HEX: case S_STRING: - newval = symbol_empty.curr; + newval.val = ""; break; case S_BOOLEAN: case S_TRISTATE: @@ -697,13 +691,12 @@ const char *sym_get_string_default(struct symbol *sym) { struct property *prop; struct symbol *ds; - const char *str; + const char *str = ""; tristate val; sym_calc_visibility(sym); sym_calc_value(modules_sym); val = symbol_no.curr.tri; - str = symbol_empty.curr.val; /* If symbol has a default value look it up */ prop = sym_get_default_prop(sym); From patchwork Sat Nov 25 16:35:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169757 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2041033vqx; Sat, 25 Nov 2023 08:36:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IEWAJT1bXnQuVWCSYrjnIF9X21hrcuCBYkWIP4+JqodTt6uzF44+WZ2I74D9wty/gs262Mu X-Received: by 2002:a05:6a20:4401:b0:18a:d4ea:1678 with SMTP id ce1-20020a056a20440100b0018ad4ea1678mr9841029pzb.15.1700930199968; Sat, 25 Nov 2023 08:36:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700930199; cv=none; d=google.com; s=arc-20160816; b=mHDRCTk3jpf1GwAD/9XK5UA8pgtiIQF9Gqi0pspst1SJPe7lBPeYs9XgjYDf7Y3VVg hilzmz//RJxhpQy2OhqalOhJW6hNHaz+xRdl0m7pqhXD6q2D2XkVKIiYtBut+vx5Zf+V hSrxpLh4LHCaqpnIbLDZMapmdwLZWBnwfLV4UD+DuzaZuRUVW2IWL7Q9qV6vPr1jJiTF mQQP8Ub2jRbQaPE1tJeL64lOLd+ZbkPxpCJc3XpD2+70d2JYuvd/PDV8/Hio2Z4QOroX ryNWxOznkOv14NhbpcYAC6nn+03uVBgH7erDyI1jz89lqlDm/N8jodmJUfVHaJne0HQO KguQ== 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=GOPMfY6sw6huBZs2jDj6TuP59LLK7vUZAvkkWNgPSXA=; fh=cr2kAYujDVm2vUVjNQU/xxltWJfGGL3pZvB2q4ufDBk=; b=lOz+NBomjFLBl3zrMVfKePRx2psA5rmJ7WxJ3wn5LGL1xfBjH+RUjgOc6zs+lgHWRa BHC1p48gBWHGeKYrTIc3ueudM+bYow4BoWHklo/Vj+P+VSXtD9o4jQPNXkMx//Ly4OoN el9zzn5ITEi+28hXtYSMGXu7/pBg06tbdmRECYKp0h9KZxZXgM6ah5L1YpdPPbKItbxK TeNRwzPHXHeABjwa9Hj8Kz/Q0pNYyIYqHaj8dozh/t+D1Njn2FTEKkoLn047hLiEFrwX 6D144+yAjQDvA53/xV8pfOcObLR0eTgdsaqKvlzsLkS3YL69BnXm4Yp+07rEwHSq/gxk og3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JSTkkAP7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id a15-20020a65640f000000b005b92b8e70f1si6062057pgv.27.2023.11.25.08.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 08:36:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JSTkkAP7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 41D8E8023702; Sat, 25 Nov 2023 08:36:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232341AbjKYQgN (ORCPT + 99 others); Sat, 25 Nov 2023 11:36:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232458AbjKYQgA (ORCPT ); Sat, 25 Nov 2023 11:36:00 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 595E018C for ; Sat, 25 Nov 2023 08:36:07 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A1C3C433CA; Sat, 25 Nov 2023 16:36:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700930167; bh=snAd2gXiU18UJUY/4dnU7CGitVyQiD9gCk0F0qZU16g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JSTkkAP710e1BVX6uUzgeCcFCBX0PDgDkZy5hMyswz1EYBTjSm8mIj4yMRyQjdYwC 3PMxs4Je5aZwyIR2DiAmDZ0X2gm5WRYXn3ZtqnQFc+/+0oQRcGLv0NTfPp8HCAxLph O3nwMVOoLHf5ZqxhFkrc0tltr8NQISsCsVVt53FvaJDqfA53EnRVbkv+GnEkl/3OLc oCiwJHiUiareSq9JXo+ij0YsvCCM4lLaJB7CElquhrDqkh0gPEdogxW+ASrb10SnG0 meLeekLlh+kbPZcIl3q3kyZ6/7JUlNs5qzYlm91d8CJuSziUgdvtjr4Vo4V5rmfcta Tw87XNbUhaI1g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] kconfig: default to zero if int/hex symbol lacks default property Date: Sun, 26 Nov 2023 01:35:59 +0900 Message-Id: <20231125163559.824210-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231125163559.824210-1-masahiroy@kernel.org> References: <20231125163559.824210-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 pete.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 (pete.vger.email [0.0.0.0]); Sat, 25 Nov 2023 08:36:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783554585166894499 X-GMAIL-MSGID: 1783554585166894499 When a default property is missing in an int or hex symbol, it defaults to an empty string, which is not a valid symbol value. It results in a incorrect .config, and can also lead to an infinite loop in scripting. Use "0" for int and "0x0" for hex as a default value. Signed-off-by: Masahiro Yamada Reviewed-by: Yoann Congal --- scripts/kconfig/symbol.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index f7075d148ac7..a5a4f9153eb7 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -338,7 +338,11 @@ void sym_calc_value(struct symbol *sym) switch (sym->type) { case S_INT: + newval.val = "0"; + break; case S_HEX: + newval.val = "0x0"; + break; case S_STRING: newval.val = ""; break; @@ -746,14 +750,17 @@ const char *sym_get_string_default(struct symbol *sym) case yes: return "y"; } case S_INT: + if (!str[0]) + str = "0"; + break; case S_HEX: - return str; - case S_STRING: - return str; - case S_UNKNOWN: + if (!str[0]) + str = "0x0"; + break; + default: break; } - return ""; + return str; } const char *sym_get_string_value(struct symbol *sym)