Received-SPF: pass (google.com: domain of linux-kernel+bounces-203180-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Wed, 5 Jun 2024 22:30:14 +0200
From: Nicolas Schier <nicolas@fjasle.eu>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/3] kconfig: refactor conf_write_defconfig() to reduce
 indentation level
Message-ID: <ZmDK1lCE8VRdWmWU@fjasle.eu>
References: <20240602125416.976336-1-masahiroy@kernel.org>
 <20240602125416.976336-3-masahiroy@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="hQIwDeXNxeCl02bX"
Content-Disposition: inline
In-Reply-To: <20240602125416.976336-3-masahiroy@kernel.org>
Feedback-ID: 1174286m:1174286a9YXZ7r:1174286sd201zyaj4


--hQIwDeXNxeCl02bX
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Jun 02, 2024 at 09:54:16PM +0900 Masahiro Yamada wrote:
> Reduce the indentation level by continue'ing the loop earlier
> if (!sym || sym_is_choice(sym)).
>=20
> No functional change intended.
>=20
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>=20
>  scripts/kconfig/confdata.c | 47 ++++++++++++++++++--------------------
>  1 file changed, 22 insertions(+), 25 deletions(-)
>=20
> diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
> index 25c327ae3c5c..1ac7fc9ad756 100644
> --- a/scripts/kconfig/confdata.c
> +++ b/scripts/kconfig/confdata.c
> @@ -774,34 +774,31 @@ int conf_write_defconfig(const char *filename)
>  		struct menu *choice;
> =20
>  		sym =3D menu->sym;
> -		if (sym && !sym_is_choice(sym)) {
> -			sym_calc_value(sym);
> -			if (!(sym->flags & SYMBOL_WRITE))
> -				continue;
> -			sym->flags &=3D ~SYMBOL_WRITE;
> -			/* If we cannot change the symbol - skip */
> -			if (!sym_is_changeable(sym))
> -				continue;
> -			/* If symbol equals to default value - skip */
> -			if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) =
=3D=3D 0)
> -				continue;
> =20
> -			/*
> -			 * If symbol is a choice value and equals to the
> -			 * default for a choice - skip.
> -			 */
> -			choice =3D sym_get_choice_menu(sym);
> -			if (choice) {
> -				struct symbol *ds;
> +		if (!sym || sym_is_choice(sym))
> +			continue;
> =20
> -				ds =3D sym_choice_default(choice->sym);
> -				if (sym =3D=3D ds) {
> -					if (sym_get_tristate_value(sym) =3D=3D yes)
> -						continue;
> -				}
> -			}
> -			print_symbol_for_dotconfig(out, sym);
> +		sym_calc_value(sym);
> +		if (!(sym->flags & SYMBOL_WRITE))
> +			continue;
> +		sym->flags &=3D ~SYMBOL_WRITE;
> +		/* Skip unchangeable symbols */
> +		if (!sym_is_changeable(sym))
> +			continue;
> +		/* Skip symbols that are equal to the default */
> +		if (!strcmp(sym_get_string_value(sym), sym_get_string_default(sym)))
> +			continue;
> +
> +		/* Skip choice values that are equal to the default */
> +		choice =3D sym_get_choice_menu(sym);
> +		if (choice) {
> +			struct symbol *ds;
> +
> +			ds =3D sym_choice_default(choice->sym);
> +			if (sym =3D=3D ds && sym_get_tristate_value(sym) =3D=3D yes)
> +				continue;
>  		}
> +		print_symbol_for_dotconfig(out, sym);
>  	}
>  	fclose(out);
>  	return 0;
> --=20
> 2.40.1
>=20
>=20

Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>

--=20
epost|xmpp: nicolas@fjasle.eu          irc://oftc.net/nsc
=E2=86=B3 gpg: 18ed 52db e34f 860e e9fb  c82b 7d97 0932 55a0 ce7f
     -- frykten for herren er opphav til kunnskap --

--hQIwDeXNxeCl02bX
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEh0E3p4c3JKeBvsLGB1IKcBYmEmkFAmZgytYACgkQB1IKcBYm
EmnPeRAAnUmonbGlYZfpAdixUvrePoFIE5BKpovbtT+Zt9L37gAXWNqpT5qEA4mY
LbeCsSlHeckJXoSCbDI008J4zm7dGhXVRw7aukQWDMqEfVLtZ7jdOD9CwDQzVMGh
tL/hI5HtJqSJtZHGW41cSFlmPG9We2CeP97zbuUCeY/6aiwyIgRYWsAqhTzL/Klz
mxUEaeQLQQ3BC3RuFZnY9uBMqd2rHY+d03eEgTUaQl7ouGiCdH6vTXBxcAdFURDi
b4olF87uZ8WekGCuycRWcisIylhWIS3PXfljkh57Wl7Hn/ItJC+5rSEaE01ZAmb4
ukk9DUBSmDOKydcDyMlbCnL0yxd8ZAiAXakzyYHRxmayVSQkPUEB0c2OMIqAO6C9
7Mm7720MYd44TpLIdDiAmN7OAPNdJrKlmIeIIVkaGR2QSa9pDoQVfQBhVanZxjrh
GlN4WDPaiM+RBKDUmSwd6m/F+3/Wea60HsQqHwoKVWwAEUnuNhFmYKaus9ItZ7H5
0bh7hnRP6m6qsfNzVpyEhMR1NZse0/xfZRtPd3iwleEDv0qR8gsbfQAnTyN8WIDF
QLcQmsIaKAkwBb1oU/z7qVOs/a+CH9R9BucH50itPQLA40PK5Xo30hofY5ZQOZ2F
/dny5wW2hLOSY/o9rzqeMx2ORDvm3mWOrHSVrq+VW4S5yALkRgo=
=ikzb
-----END PGP SIGNATURE-----

--hQIwDeXNxeCl02bX--