]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
kconfig: gconf: refactor text_insert_help()
authorMasahiro Yamada <masahiroy@kernel.org>
Wed, 16 Jul 2025 23:24:13 +0000 (08:24 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Sat, 26 Jul 2025 10:55:37 +0000 (19:55 +0900)
text_insert_help() and text_insert_msg() share similar code.
Refactor text_insert_help() to eliminate the code duplication.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
scripts/kconfig/gconf.c

index 651140af7d1371ed8a9af325fde5c9a5daa20450..8b164ccfa008875e6001bf7447af7cd8bfd489e1 100644 (file)
@@ -64,15 +64,10 @@ static void conf_changed(bool dirty)
 
 /* Utility Functions */
 
-
-static void text_insert_help(struct menu *menu)
+static void text_insert_msg(const char *title, const char *msg)
 {
        GtkTextBuffer *buffer;
        GtkTextIter start, end;
-       const char *prompt = menu_get_prompt(menu);
-       struct gstr help = str_new();
-
-       menu_get_ext_help(menu, &help);
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
        gtk_text_buffer_get_bounds(buffer, &start, &end);
@@ -80,33 +75,21 @@ static void text_insert_help(struct menu *menu)
        gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text_w), 15);
 
        gtk_text_buffer_get_end_iter(buffer, &end);
-       gtk_text_buffer_insert_with_tags(buffer, &end, prompt, -1, tag1,
+       gtk_text_buffer_insert_with_tags(buffer, &end, title, -1, tag1,
                                         NULL);
        gtk_text_buffer_insert_at_cursor(buffer, "\n\n", 2);
        gtk_text_buffer_get_end_iter(buffer, &end);
-       gtk_text_buffer_insert_with_tags(buffer, &end, str_get(&help), -1, tag2,
+       gtk_text_buffer_insert_with_tags(buffer, &end, msg, -1, tag2,
                                         NULL);
-       str_free(&help);
 }
 
-
-static void text_insert_msg(const char *title, const char *msg)
+static void text_insert_help(struct menu *menu)
 {
-       GtkTextBuffer *buffer;
-       GtkTextIter start, end;
-
-       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
-       gtk_text_buffer_get_bounds(buffer, &start, &end);
-       gtk_text_buffer_delete(buffer, &start, &end);
-       gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text_w), 15);
+       struct gstr help = str_new();
 
-       gtk_text_buffer_get_end_iter(buffer, &end);
-       gtk_text_buffer_insert_with_tags(buffer, &end, title, -1, tag1,
-                                        NULL);
-       gtk_text_buffer_insert_at_cursor(buffer, "\n\n", 2);
-       gtk_text_buffer_get_end_iter(buffer, &end);
-       gtk_text_buffer_insert_with_tags(buffer, &end, msg, -1, tag2,
-                                        NULL);
+       menu_get_ext_help(menu, &help);
+       text_insert_msg(menu_get_prompt(menu), str_get(&help));
+       str_free(&help);
 }
 
 static void _select_menu(GtkTreeView *view, GtkTreeModel *model,