Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 19 Mar 2021 19:37:14 +0000
To:     Masahiro Yamada <masahiroy@kernel.org>
From:   Alexander Lobakin <alobakin@pm.me>
Cc:     Alexander Lobakin <alobakin@pm.me>, linux-kbuild@vger.kernel.org,
        linux-kernel@vger.kernel.org
Reply-To: Alexander Lobakin <alobakin@pm.me>
Subject: [PATCH RESEND 2/2] kconfig: mention submenu type in comment blocks in .config
Message-ID: <20210319193705.267922-3-alobakin@pm.me>
In-Reply-To: <20210319193705.267922-1-alobakin@pm.me>
References: <20210319193705.267922-1-alobakin@pm.me>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

To have a better understanding of the dotconfig blocks, mention if
a particular block-commented section is a choice or a menu{,config}.

Before:

x
x Timers subsystem
x
CONFIG_TICK_ONESHOT=3Dy
CONFIG_NO_HZ_COMMON=3Dy

x
x Timer tick handling
x
x CONFIG_HZ_PERIODIC is not set
CONFIG_NO_HZ_IDLE=3Dy
x end of Timer tick handling

x CONFIG_NO_HZ is not set
CONFIG_HIGH_RES_TIMERS=3Dy
x end of Timers subsystem

After:

x
x Timers subsystem menu
x
CONFIG_TICK_ONESHOT=3Dy
CONFIG_NO_HZ_COMMON=3Dy

x
x Timer tick handling choice
x
x CONFIG_HZ_PERIODIC is not set
CONFIG_NO_HZ_IDLE=3Dy
x end of Timer tick handling choice

x CONFIG_NO_HZ is not set
CONFIG_HIGH_RES_TIMERS=3Dy
x end of Timers subsystem menu

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
 scripts/kconfig/confdata.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index e4f0a21fd469..3f50d8b82a54 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -822,6 +822,17 @@ int conf_write_defconfig(const char *filename)
 =09return 0;
 }

+static const char *menu_type_string(const struct menu *menu)
+{
+=09if (menu->sym && (menu->sym->flags & SYMBOL_CHOICE))
+=09=09return " choice";
+
+=09if (menu->prompt && menu->prompt->type =3D=3D P_MENU)
+=09=09return " menu";
+
+=09return "";
+}
+
 int conf_write(const char *name)
 {
 =09FILE *out;
@@ -876,8 +887,8 @@ int conf_write(const char *name)
 =09=09=09str =3D menu_get_prompt(menu);
 =09=09=09fprintf(out, "\n"
 =09=09=09=09     "#\n"
-=09=09=09=09     "# %s\n"
-=09=09=09=09     "#\n", str);
+=09=09=09=09     "# %s%s\n"
+=09=09=09=09     "#\n", str, menu_type_string(menu));
 =09=09=09need_newline =3D false;
 =09=09}

@@ -905,7 +916,8 @@ int conf_write(const char *name)
 =09=09=09     (menu->prompt && menu->prompt->type =3D=3D P_MENU)) &&
 =09=09=09    menu_is_visible(menu) && menu !=3D &rootmenu) {
 =09=09=09=09str =3D menu_get_prompt(menu);
-=09=09=09=09fprintf(out, "# end of %s\n", str);
+=09=09=09=09fprintf(out, "# end of %s%s\n", str,
+=09=09=09=09=09menu_type_string(menu));
 =09=09=09=09need_newline =3D true;
 =09=09=09}
 =09=09=09if (menu->next) {
--
2.31.0