Skip to contentSkip to conversation

kconfig: qconf: revive help message in the info view

PATCH In review Masahiro Yamada 1 participant 2 messages Sep 14, 2020 – Sep 17, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kconfig: qconf: revive help message in the info view

Since commit 68fd110b3e7e ("kconfig: qconf: remove redundant help in the info view"), the help message is no longer displayed.

I intended to drop duplicated "Symbol:", "Type:", but precious info about help and reverse dependencies was lost too.

Revive it now.

"defined at" is contained in menu_get_ext_help(), so I made sure to not display it twice.

Fixes 68fd110b3e7e ("kconfig: qconf: remove redundant help in the info view")

---

 scripts/kconfig/qconf.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
scripts/kconfig/qconf.cc +8 -3
index 8638785328a7..9f306e780c2f 100644
@@ -1108,6 +1108,11 @@ void ConfigInfoView::menuInfo(void)
 		if (showDebug())
 			stream << debug_info(sym);
 
+		struct gstr help_gstr = str_new();
+
+		menu_get_ext_help(_menu, &help_gstr);
+		stream << print_filter(str_get(&help_gstr));
+		str_free(&help_gstr);
 	} else if (_menu->prompt) {
 		stream << "<big><b>";
 		stream << print_filter(_menu->prompt->text);
@@ -1119,11 +1124,11 @@ void ConfigInfoView::menuInfo(void)
 					   expr_print_help, &stream, E_NONE);
 				stream << "<br><br>";
 			}
+
+			stream << "defined at " << _menu->file->name << ":"
+			       << _menu->lineno << "<br><br>";
 		}
 	}
-	if (showDebug())
-		stream << "defined at " << _menu->file->name << ":"
-		       << _menu->lineno << "<br><br>";
 
 	setText(info);
 }
Signature · 1 line
2.25.1
#1 lore raw
Quoted 9 lines · Masahiro Yamada

Since commit 68fd110b3e7e ("kconfig: qconf: remove redundant help in the info view"), the help message is no longer displayed.

I intended to drop duplicated "Symbol:", "Type:", but precious info about help and reverse dependencies was lost too.

Revive it now.

Quoted 7 lines

"defined at" is contained in menu_get_ext_help(), so I made sure to not display it twice.

Fixes 68fd110b3e7e ("kconfig: qconf: remove redundant help in the info view")

---

Applied to linux-kbuild/fixes.

Quoted 38 lines
 scripts/kconfig/qconf.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
scripts/kconfig/qconf.cc +8 -4
index 8638785328a7..9f306e780c2f 100644
@@ -1108,6 +1108,11 @@ void ConfigInfoView::menuInfo(void)
                if (showDebug())
                        stream << debug_info(sym);
 
+               struct gstr help_gstr = str_new();
+
+               menu_get_ext_help(_menu, &help_gstr);
+               stream << print_filter(str_get(&help_gstr));
+               str_free(&help_gstr);
        } else if (_menu->prompt) {
                stream << "<big><b>";
                stream << print_filter(_menu->prompt->text);
@@ -1119,11 +1124,11 @@ void ConfigInfoView::menuInfo(void)
                                           expr_print_help, &stream, E_NONE);
                                stream << "<br><br>";
                        }
+
+                       stream << "defined at " << _menu->file->name << ":"
+                              << _menu->lineno << "<br><br>";
                }
        }
-       if (showDebug())
-               stream << "defined at " << _menu->file->name << ":"
-                      << _menu->lineno << "<br><br>";
 
        setText(info);
 }
--

2.25.1

Signature · 2 lines
Best Regards
Masahiro Yamada