tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'kbuild-fixes-v5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:
"Fix qconf warnings and revive help message"

* tag 'kbuild-fixes-v5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kconfig: qconf: revive help message in the info view
kconfig: qconf: fix incomplete type 'struct gstr' warning
kconfig: qconf: use delete[] instead of delete to free array (again)

Linus Torvalds c7948fe9 325d0eab

+39 -35
+30 -17
scripts/kconfig/lkc.h
··· 66 66 fprintf(stderr, "Error in writing or end of file.\n"); 67 67 } 68 68 69 - /* menu.c */ 70 - void _menu_init(void); 71 - void menu_warn(struct menu *menu, const char *fmt, ...); 72 - struct menu *menu_add_menu(void); 73 - void menu_end_menu(void); 74 - void menu_add_entry(struct symbol *sym); 75 - void menu_add_dep(struct expr *dep); 76 - void menu_add_visibility(struct expr *dep); 77 - struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep); 78 - void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep); 79 - void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep); 80 - void menu_add_option_modules(void); 81 - void menu_add_option_defconfig_list(void); 82 - void menu_add_option_allnoconfig_y(void); 83 - void menu_finalize(struct menu *parent); 84 - void menu_set_type(int type); 85 - 86 69 /* util.c */ 87 70 struct file *file_lookup(const char *name); 88 71 void *xmalloc(size_t size); ··· 91 108 void str_append(struct gstr *gs, const char *s); 92 109 void str_printf(struct gstr *gs, const char *fmt, ...); 93 110 const char *str_get(struct gstr *gs); 111 + 112 + /* menu.c */ 113 + void _menu_init(void); 114 + void menu_warn(struct menu *menu, const char *fmt, ...); 115 + struct menu *menu_add_menu(void); 116 + void menu_end_menu(void); 117 + void menu_add_entry(struct symbol *sym); 118 + void menu_add_dep(struct expr *dep); 119 + void menu_add_visibility(struct expr *dep); 120 + struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep); 121 + void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep); 122 + void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep); 123 + void menu_add_option_modules(void); 124 + void menu_add_option_defconfig_list(void); 125 + void menu_add_option_allnoconfig_y(void); 126 + void menu_finalize(struct menu *parent); 127 + void menu_set_type(int type); 128 + 129 + extern struct menu rootmenu; 130 + 131 + bool menu_is_empty(struct menu *menu); 132 + bool menu_is_visible(struct menu *menu); 133 + bool menu_has_prompt(struct menu *menu); 134 + const char *menu_get_prompt(struct menu *menu); 135 + struct menu *menu_get_root_menu(struct menu *menu); 136 + struct menu *menu_get_parent_menu(struct menu *menu); 137 + bool menu_has_help(struct menu *menu); 138 + const char *menu_get_help(struct menu *menu); 139 + struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head); 140 + void menu_get_ext_help(struct menu *menu, struct gstr *help); 94 141 95 142 /* symbol.c */ 96 143 void sym_clear_all_valid(void);
-14
scripts/kconfig/lkc_proto.h
··· 12 12 void conf_set_changed_callback(void (*fn)(void)); 13 13 void conf_set_message_callback(void (*fn)(const char *s)); 14 14 15 - /* menu.c */ 16 - extern struct menu rootmenu; 17 - 18 - bool menu_is_empty(struct menu *menu); 19 - bool menu_is_visible(struct menu *menu); 20 - bool menu_has_prompt(struct menu *menu); 21 - const char * menu_get_prompt(struct menu *menu); 22 - struct menu * menu_get_root_menu(struct menu *menu); 23 - struct menu * menu_get_parent_menu(struct menu *menu); 24 - bool menu_has_help(struct menu *menu); 25 - const char * menu_get_help(struct menu *menu); 26 - struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head); 27 - void menu_get_ext_help(struct menu *menu, struct gstr *help); 28 - 29 15 /* symbol.c */ 30 16 extern struct symbol * symbol_hash[SYMBOL_HASHSIZE]; 31 17
+9 -4
scripts/kconfig/qconf.cc
··· 1108 1108 if (showDebug()) 1109 1109 stream << debug_info(sym); 1110 1110 1111 + struct gstr help_gstr = str_new(); 1112 + 1113 + menu_get_ext_help(_menu, &help_gstr); 1114 + stream << print_filter(str_get(&help_gstr)); 1115 + str_free(&help_gstr); 1111 1116 } else if (_menu->prompt) { 1112 1117 stream << "<big><b>"; 1113 1118 stream << print_filter(_menu->prompt->text); ··· 1124 1119 expr_print_help, &stream, E_NONE); 1125 1120 stream << "<br><br>"; 1126 1121 } 1122 + 1123 + stream << "defined at " << _menu->file->name << ":" 1124 + << _menu->lineno << "<br><br>"; 1127 1125 } 1128 1126 } 1129 - if (showDebug()) 1130 - stream << "defined at " << _menu->file->name << ":" 1131 - << _menu->lineno << "<br><br>"; 1132 1127 1133 1128 setText(info); 1134 1129 } ··· 1281 1276 } 1282 1277 1283 1278 free(result); 1284 - delete data; 1279 + delete[] data; 1285 1280 } 1286 1281 1287 1282 void ConfigInfoView::contextMenuEvent(QContextMenuEvent *event)