Received-SPF: pass (google.com: domain of linux-kernel+bounces-203169-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 5 Jun 2024 22:25:45 +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 2/3] kconfig: refactor conf_set_all_new_symbols() to
 reduce indentation level
Message-ID: <ZmDJya3X1rwtHteD@fjasle.eu>
References: <20240602125416.976336-1-masahiroy@kernel.org>
 <20240602125416.976336-2-masahiroy@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="mlfnEBJWXlybmKlf"
Content-Disposition: inline
In-Reply-To: <20240602125416.976336-2-masahiroy@kernel.org>
Feedback-ID: 1174286m:1174286a9YXZ7r:1174286sP1Qs_fKIH


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

On Sun, Jun 02, 2024 at 09:54:15PM +0900 Masahiro Yamada wrote:
> The outer switch statement can be avoided by continue'ing earlier the
> loop when the symbol type is neither S_BOOLEAN nor S_TRISTATE.
>=20
> Remove it to reduce the indentation level by one. In addition, avoid
> the repetition of sym->def[S_DEF_USER].tri.
>=20
> No functional change intended.
>=20
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>=20
>  scripts/kconfig/conf.c | 61 +++++++++++++++++++++---------------------
>  1 file changed, 30 insertions(+), 31 deletions(-)
>=20
> diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
> index 9a20e9e9bdad..cf8193fc00fc 100644
> --- a/scripts/kconfig/conf.c
> +++ b/scripts/kconfig/conf.c
> @@ -218,43 +218,42 @@ static bool conf_set_all_new_symbols(enum conf_def_=
mode mode)
>  	}
> =20
>  	for_all_symbols(sym) {
> -		if (sym_has_value(sym) || sym->flags & SYMBOL_VALID)
> +		tristate val;
> +
> +		if (sym_has_value(sym) || sym->flags & SYMBOL_VALID ||
> +		    (sym->type !=3D S_BOOLEAN && sym->type !=3D S_TRISTATE))
>  			continue;
> -		switch (sym_get_type(sym)) {
> -		case S_BOOLEAN:
> -		case S_TRISTATE:
> -			has_changed =3D true;
> -			switch (mode) {
> -			case def_yes:
> -				sym->def[S_DEF_USER].tri =3D yes;
> -				break;
> -			case def_mod:
> -				sym->def[S_DEF_USER].tri =3D mod;
> -				break;
> -			case def_no:
> -				sym->def[S_DEF_USER].tri =3D no;
> -				break;
> -			case def_random:
> -				sym->def[S_DEF_USER].tri =3D no;
> -				cnt =3D rand() % 100;
> -				if (sym->type =3D=3D S_TRISTATE) {
> -					if (cnt < pty)
> -						sym->def[S_DEF_USER].tri =3D yes;
> -					else if (cnt < pty + ptm)
> -						sym->def[S_DEF_USER].tri =3D mod;
> -				} else if (cnt < pby)
> -					sym->def[S_DEF_USER].tri =3D yes;
> -				break;
> -			default:
> -				continue;
> +
> +		has_changed =3D true;
> +		switch (mode) {
> +		case def_yes:
> +			val =3D yes;
> +			break;
> +		case def_mod:
> +			val =3D mod;
> +			break;
> +		case def_no:
> +			val =3D no;
> +			break;
> +		case def_random:
> +			val =3D no;
> +			cnt =3D rand() % 100;
> +			if (sym->type =3D=3D S_TRISTATE) {
> +				if (cnt < pty)
> +					val =3D yes;
> +				else if (cnt < pty + ptm)
> +					val =3D mod;
> +			} else if (cnt < pby) {
> +				val =3D yes;
>  			}
> -			if (!(sym_is_choice(sym) && mode =3D=3D def_random))
> -				sym->flags |=3D SYMBOL_DEF_USER;
>  			break;
>  		default:
> -			break;
> +			continue;
>  		}
> +		sym->def[S_DEF_USER].tri =3D val;
> =20
> +		if (!(sym_is_choice(sym) && mode =3D=3D def_random))
> +			sym->flags |=3D SYMBOL_DEF_USER;
>  	}
> =20
>  	sym_clear_all_valid();
> --=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 --

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

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

iQIzBAABCAAdFiEEh0E3p4c3JKeBvsLGB1IKcBYmEmkFAmZgycQACgkQB1IKcBYm
EmmNpw//UNaTItKxl1xfxquC6HZL/5u/yWCjDc7lS5gD6KLhf0Jma2mncjEY3j5G
QwYpACT+9SYsIBv9ZIoEjWhrQ+uZSx8ZEzPaWU8BrgZ6bMpATrgFIShAG7mNaQPy
GAJR84elQbQ7C0DUJ+kQTObhNzhnZ9zd5mqdGq7htsVE63u4pdtU8stJntOuX3dV
6jcth+0yf/jnssH+JOvmg7j5uOeZUytOFWMgutVSg2g4yQw+BSBLzbSnfSt5/2Ik
Eyorsn4RutCkTzTZR6aXCkYzAaouJAZmmVoyKTwDyVsy8TcMSgDacPoJ9G2LalIs
tNUaLN2e/+g8mItcu5bzeT0WgoqydSAAgtDWldskx3QsbGUsNQSn8XW+a/tFiXvg
de5jJeC8Zh18tJGVJfFTxDzl09RZrXS2cCNaIxkeFUwXYJs2FJh1IWL9vuGPOhDb
o0wqLX1LdMBwGncV4Lq167N7P7Dz6XFVwF4lXTRhGgdBjfKKlSNrQGMhx9QmpURH
mBIy+Ej8AGvIfoRgjT8gY3MbHGNSQpTt1XAZig0/kJmD6RIwMhco92kp3THJBAm9
Ls9DGB2ez+oItAK+poBkqBw/j/wBtKGoJewVUOZ7j71AmoZNhS0vs7DU/c2h87Y6
RXfS+e/wqObDGq3egiSz/Z2yxvzfmo1vichnE8zQ2ciGtC1xoKY=
=qZNG
-----END PGP SIGNATURE-----

--mlfnEBJWXlybmKlf--