Received: by 2002:ab2:6a05:0:b0:1f8:1780:a4ed with SMTP id w5csp399600lqo; Fri, 10 May 2024 03:27:52 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUzEBHYYYc7X5Wua2J/RjZ4jEuXL/swuN3ygkE6b5bHAAim14RZldiIK2j5ZO04I8NLUVOYWB8fTyx3px6TLZUYvCOSyFLmQanY9xEVPQ== X-Google-Smtp-Source: AGHT+IFiKnweucMptO5jCD70ZHP9MNfJEgVoBb2ux3o3105hztntFNaoIsBaUhy4f/KWvRkt/Euy X-Received: by 2002:a05:6a21:2782:b0:1af:b80e:5406 with SMTP id adf61e73a8af0-1afde0d4d1amr2122144637.21.1715336872356; Fri, 10 May 2024 03:27:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715336872; cv=pass; d=google.com; s=arc-20160816; b=vWh6MsnhV44t8QNmDUhFfTllgAVQJQ2i6AdGSkY+aRMGfAVkQ3RybSLot6UP2Rx53V cnfghhDLZz7wE0XitIm++VYSr7pDtg3EpMza+H1RXv3phjgc/JlzdoGguJ36ZHaCwuDr OmY9nZhvmN21eU3jXWA/oSoMURGZgeWB4VPeBGgwH6V5PuvchjNw/VJdho6R6qzA1+rY Kr7ir++OBAYohDHWiBu+pUHGxddywAhdOBSYBCV0DWvik/GcFY9RkWzJjC8Peu9hsQvM t6KB4vYNZbrq4AX2mS4Qhh8bzfSKxsA4uOGAlraKY6hqf/fkH5SkExROX+yWcqnxpV/9 zzmg== 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=FFOkq32NuueZVxN7IO8lJzg7Xw6ZFrYNVPFDk39wK5s=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=rD73lgH8UYtlKtxVo71Mmbq43dbWcmGag5BD7uwPXbH6cKCa/bsW74Ubbp37cHFsdI 84L6Sc1pcKXFVCK+We5P69jAjThykwdY5YavdTupLQ9v2RSBoMTTomke2sQaVuqJ7Tt3 ot7c1gRWAKtapfRr92kAzbSfdtsdYvziYdKrfB9ZFg29og9ZHAUGdPXjldv/BuaO5fjE hpNJbNVQe+7Mxbt9CClQnUbwUPaIKOJIYsQajkfSAr+ifOf/HyTOh3TZHIGVVtwo+Caa SJhyZggmyVlhKHR8aHCmWR7/NpV6TK+6HX2GGeAMWU6KA9qa5crvBl4UwWZfhYNn8WSQ 6VRg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LKEfKsON; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-175589-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-175589-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d9443c01a7336-1ef0c26749esi35951965ad.566.2024.05.10.03.27.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 May 2024 03:27:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-175589-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LKEfKsON; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-175589-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-175589-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id D39D8283A1F for ; Fri, 10 May 2024 10:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5662A16D4D6; Fri, 10 May 2024 10:24:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LKEfKsON" 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 7A4FD16C863; Fri, 10 May 2024 10:24:44 +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=1715336684; cv=none; b=JrWez9pjnDSb5mX6r6XGpFuGieJ8GHVNW+S2zaYGDqM8hDyAYaDePXggg4ts7Q4QmmuXwEMSsnIo+j3ZpCZXBvotCxGmOF8QzAeq8dmG8k9l0ggIZu9IsfU4Ig4NNqKIULb+qq5sW/myba2SGF1w1amVHcHio1bRSh9XNRj9S+c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715336684; c=relaxed/simple; bh=7Cou4XrABzcgomDRnVTRkEhZ2jNwhltEsvMLKE86NHE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ffttCf/EVnUHhEUcOCUHleeOXzf3nQFUCq5SkF5dKY/DfOyGDzKZwny5CfP68v+bobu+4pC5C6a7QJxYKECUGloTOhxAENZT9s9w243M0LT6heo1zXiEHB6tgYA3Fls9lOOH16sA6azRgl4/j4xk3qwFNhZ9jqSFltRG6TfrwgQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LKEfKsON; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 974D7C4AF0A; Fri, 10 May 2024 10:24:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715336684; bh=7Cou4XrABzcgomDRnVTRkEhZ2jNwhltEsvMLKE86NHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LKEfKsONXvhUv0mbcnoZLGZGDLpLEF9LW9lxxSVmA+ZHUrdRXfe4bikOdjdUgVW5C CsrhCe01qI4UezBi2xF0CPSrKzx4zYHgeCUUl2Gu4JPORGo2bPCYuluSMXrLHmHluN SrVKMGYvxlLaTpuSF9l93cuHXChu8h5pq9D5G0jGQ7qiKZWEu61gE4NmDej5LmapuW Xqk+53odc9oAqyNeh53dkwwRS9AuhLAUrnFBkl8FTEoCNlR9JsxGl7QoP9VCb+Llpi Sd1UkijAiPldDl8ltWTZmN1xckidmVaXKyyqZ39Z6TDI8nekaOFChCHBTLRH65Y+IK as8jF+j0chSqA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH v2 3/3] kconfig: m/nconf: merge two item_add_str() calls Date: Fri, 10 May 2024 19:23:23 +0900 Message-Id: <20240510102323.2948886-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240510102323.2948886-1-masahiroy@kernel.org> References: <20240510102323.2948886-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 --- (no changes since v1) 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 90cd59a96aac..d6a61ca1a984 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 93047cd28f3f..e1cb09418cbe 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