From patchwork Sat Nov 18 07:59:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 166467 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1047872vqn; Fri, 17 Nov 2023 23:59:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IHGEc/OWmhy32XS8LjLBY9dAvO45jfa4ibibXfKJU3JwXV35sMgZv1aJwtSyOhJOjqFk7+V X-Received: by 2002:a05:6a20:12c4:b0:187:df72:48ef with SMTP id v4-20020a056a2012c400b00187df7248efmr2343780pzg.0.1700294383736; Fri, 17 Nov 2023 23:59:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700294383; cv=none; d=google.com; s=arc-20160816; b=G8w2fEbtGXKCclNf4UHRaos14gkWF6cHlGxccPP6lRdAIjrxoFqEdm8DihyxJg4fB4 Eke51duHB7kYUJtry1ePXoEz8HllM9RwMDN1BXvosZGrqxyVPj0fvleuywzc6dKEu9Zx oYj97FUAZ5UQvjAdqAuf3om7DIzVvee+w9HvBywZgr7embu194YTfQZP1vAmR5xWfpTJ LpaFbhRat4bwmqcw82NsOaNMZMXl64JmPFnm9LBfeyirUMXU5q3h0WjYY/hCRsuD9f0O CaVJKckw6sEzqJsJnTfVunl7Ns5bgRzEymIp3vptbVzZNzwIK6Ax+ArjU2e5pHKltAWm jZmQ== 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=2KLyTHiwx2tQ37Ksrj6mIsU8ioJcauvmf3hLYotpkFM=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=0/p8d2Bftggp22qPhn4VRdUOJTJakstGES2CHYrPljISRxvdJBYY0YQqxgvvi6/JdO cnK7D4ptf8gYXoU5epem2jeUFq0SayZJYDiEBQt6M0ge5j+nU0cIO+O5WLsbFXu01XY1 VkzvkhMJVe9SUBeiJH6b2ke2orP6o3n4FLpVC6xpzZQcy4V5OkL5w/tGuA/MIQ7RLoLL Yn8TtyflwqoM4eOXHILhYYD3VUw+tTgCbUv9wLYkMN+LF1gQ6D/h7qLahBQJ2ovc4ivK XmXalJUTKEEt7NgMu/bQ9oYPiap+yRQiEpeHsX+DZY1zsTId1mVVC3QAmDPyOFGvz/E1 wylw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bYhntA+b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id v19-20020a17090ac91300b0026b698fdda6si4744391pjt.98.2023.11.17.23.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 23:59:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bYhntA+b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 8A17382AE2C1; Fri, 17 Nov 2023 23:59:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232982AbjKRH7e (ORCPT + 29 others); Sat, 18 Nov 2023 02:59:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232601AbjKRH7Z (ORCPT ); Sat, 18 Nov 2023 02:59:25 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CA29D5D for ; Fri, 17 Nov 2023 23:59:22 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55CCEC433C7; Sat, 18 Nov 2023 07:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700294362; bh=ltXpZxzZisF0fheB2Pyv5Oadd/1xNAmgjgKDKLE8PmQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bYhntA+bM5EgGMr+Y1nx358VbjA5Rv+51e6CcZ80YMxkhU4lpcKO0p/3dXATjkqjV /A1qhJ7XQkypaUyXWtwXiCmMBogTlAQtzTj4GhE0d6JAn48m0X7xA1JtoIT+0mxmaO xLlQdKJPc5vBZsuV/S/WrCVEPfl2eD2/Xxfo25ky6sqqDeAOgQzKXzhBtyKiIFY5d/ FvVHKy7p8qFn1VA9K5Et/c2VCYldtOXiadTCumf/TzhQYwkisLzvhsM8Js4cT59mjk 08gXBP+1qpMPsNY66BX4/pCAn+uMqbwPBVt8eB6+HkBKA1+r5/1CLv9FlWlKHEB3vU xU+XFBgSIXhQQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 6/6] kconfig: massage the loop in conf_read_simple() Date: Sat, 18 Nov 2023 16:59:12 +0900 Message-Id: <20231118075912.1303509-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231118075912.1303509-1-masahiroy@kernel.org> References: <20231118075912.1303509-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 23:59:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782887883701415533 X-GMAIL-MSGID: 1782887883701415533 Make the while-loop code a little more readable. The gain is that "CONFIG_FOO" without '=' is warned as unexpected data. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 958be12cd621..bd14aae1db58 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -443,6 +443,10 @@ int conf_read_simple(const char *name, int def) while (getline_stripped(&line, &line_asize, in) != -1) { conf_lineno++; + + if (!line[0]) /* blank line */ + continue; + if (line[0] == '#') { if (line[1] != ' ') continue; @@ -458,17 +462,20 @@ int conf_read_simple(const char *name, int def) continue; val = "n"; - } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) { + } else { + if (memcmp(line, CONFIG_, strlen(CONFIG_))) { + conf_warning("unexpected data: %s", line); + continue; + } + sym_name = line + strlen(CONFIG_); p = strchr(sym_name, '='); - if (!p) + if (!p) { + conf_warning("unexpected data: %s", line); continue; + } *p = 0; val = p + 1; - } else { - if (line[0] != '\0') - conf_warning("unexpected data: %s", line); - continue; } sym = sym_find(sym_name);