Received: by 2002:a89:288:0:b0:1f7:eeee:6653 with SMTP id j8csp427043lqh; Tue, 7 May 2024 03:39:15 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVdL+ABurfei8IobbafyUAKXpvVulPPWgmDImFIM/ry/z1vSdekdGcdVgqD2F2OJNqsXpU8iqHB6dXFAbrAQl4SZuvpAFNI2HNH7/Irbg== X-Google-Smtp-Source: AGHT+IECpSqqlrTsvU/hNxSA7UzroGt0JvcGNfeDnjBtB+uPdltA7l+G/AgIxfOsiC0Tl/JlFCo1 X-Received: by 2002:a05:622a:198a:b0:43a:b558:4ab7 with SMTP id u10-20020a05622a198a00b0043ab5584ab7mr3579788qtc.15.1715078355701; Tue, 07 May 2024 03:39:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715078355; cv=pass; d=google.com; s=arc-20160816; b=EsqbPbCO27m0AtFcljuQb0MMGlfjwQ6LH8PG2E3SXsJ84efDIPZ7T4c7KOogZHLmhY /OFlxP7V4CZhkRPz/+uh/qXD9xGdjq3eEXlIM5jjaaI+Lo3HdsBuHSz4cnkSR+lu+5AS jqroqNQ2pU/4zBJmpupY+ncqRovWzc6WR6Kq1aS7ZTQW7C4kQPhXRkXosDn3HCenr9pk 4zXJxreneFgYhNfoXSkKDILANbmxo/P4iYzT9DIw5pYy7A+zbd6GwpYCEyjNxjzo95yc Je7b5eYnWE122MVp9q4HvHr13NPDEDQLf1/Ad7/rzIq00C3ybRcCQYEbGm/4Fef7+46x A+pw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=0q1ETCAe6CWQfywZpa++oHOjU0ue/B84UenrYTXpkvU=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=jwArslIK0DhbqRKvw8EFqJJzxEcYJ0iuw4bgRQND6G0dImuQQR4FEDKckfreXNAh7S p+F+qcxeO8kqIMeX/2mZ7WpP4HHETie6xvxCQn2Sz6djLvsHg55P68AnkoEdM0TGmTfX LycLiVIncbmuTtynZKMzDS64xvl/1hwpTyjfuUtLAZpW+Mo5fgUHV/BC4nVmxMMh91pL yH0wGEGB0loE/OwXZztAMO2CoDpoidXX/yBVhYcFgpIbGaF87QSZq7TFSnMDzSnywKu9 oofjAb6XKSs/G5ZgOBpLYUjd1pENJZEpw3Ec7UkI1qBEkAea6ASXd9Fxc0vWRFEVN34F pOFg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hzr7eURA; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-171112-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-171112-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id m16-20020a05622a055000b0043a0941db41si11909922qtx.400.2024.05.07.03.39.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 May 2024 03:39:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-171112-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hzr7eURA; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-171112-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-171112-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 6C9861C21D66 for ; Tue, 7 May 2024 10:39:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8B96E15251B; Tue, 7 May 2024 10:38:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hzr7eURA" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4C5815218C; Tue, 7 May 2024 10:38:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715078315; cv=none; b=mK/J2ED+YDaTSC2gJ5uvoj6XOd0aRqQODq+fv4fkPK0I/Pwcz18c7n0TU3iYe2VrcZklgrAjZVvlCIOE2VCHye97pY2w2CSsVpdOjJ+DZnXnfM42G+AT6DMb0WcEY9CuEnlH/tn2xWb5ZfMvfQNqB7ReuoHAFONwOnaNOtxDD58= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715078315; c=relaxed/simple; bh=fO4AOiqirq5leBzGVUM/FBhvC5TCNr4gtWamEvUwY6w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fDnRCIXA7fnTdF+AGHD4vaYRiufZoNLCvWecQKBJl2/CWHwM3NN0yjeGDCx8NGHQqXV2L/gZObD5IZEGGJpnhx15vgGafjVTPTWHFv3KM94cK+2k8kA4+LHKGmnADluD+qfqkfKMEi2smp3hXs06d3bqneZLai3MPWOBTChbOF0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hzr7eURA; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EBB2C3277B; Tue, 7 May 2024 10:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715078315; bh=fO4AOiqirq5leBzGVUM/FBhvC5TCNr4gtWamEvUwY6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hzr7eURASJuKTpSyFnJYXMva1FcDRG0qw+Ui5n/i8KqsXG4jItcccE6xB9xMFB4Qg MUMz3FXY8m+HPTwVND44/oh+REqCon0fqQC+asEYUKkCnqDUpbefmFFHZkOsQbbeax TAZVY/KyoVwKwMHJABnso6uoO/Jh4ur6HVSottKAeKec2NCdzKHYkvdd4kt3ZhuE8L c2kl/i9zlJcB6CgL32YsZu1LWlzvKJOlQz+KtCvzTg0CABhSQiuCO/IIayqS4lHvB+ QCVHBI9t7L6NrP7xyXatTlLPHd15KZd5QD1APAyVC3IKNYimkBLaE1I27ttOmMZK4f iBE0lt4ES+iQA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 3/3] kconfig: m/nconf: merge two item_add_str() calls Date: Tue, 7 May 2024 19:37:56 +0900 Message-Id: <20240507103756.1401996-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240507103756.1401996-1-masahiroy@kernel.org> References: <20240507103756.1401996-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Just trivial cleanups. Signed-off-by: Masahiro Yamada --- scripts/kconfig/mconf.c | 6 ++---- scripts/kconfig/nconf.c | 7 ++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 64bf373f7921..33929b0b5ca8 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -541,10 +541,8 @@ static void build_conf(struct menu *menu) item_add_str("%*c%s", indent + 1, ' ', menu_get_prompt(menu)); if (val == yes) { - if (def_menu) { - item_add_str(" (%s)", menu_get_prompt(def_menu)); - item_add_str(" --->"); - } + if (def_menu) + item_add_str(" (%s) --->", menu_get_prompt(def_menu)); return; } } else { diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index 715e156fdbb1..a9ef2ced7d7a 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -845,11 +845,8 @@ static void build_conf(struct menu *menu) item_add_str("%*c%s", indent + 1, ' ', menu_get_prompt(menu)); if (val == yes) { - if (def_menu) { - item_add_str(" (%s)", - menu_get_prompt(def_menu)); - item_add_str(" --->"); - } + if (def_menu) + item_add_str(" (%s) --->", menu_get_prompt(def_menu)); return; } } else { -- 2.40.1