public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kconfig: handle format string before calling conf_message_callback()

Browse source 
As you see in mconf.c and nconf.c, conf_message_callback() hooks are
likely to end up with the boilerplate of vsnprintf().  Process the
string format before calling conf_message_callback() so that it
receives a simple string.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Dirk Gouders <dirk@gouders.net>
This commit is contained in:
Masahiro Yamada 2018-07-05 11:46:12 +09:00
parent 693359f7ac
commit 5accd7f336
4 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/kconfig/confdata.c
View file

@ -43,16 +43,16 @@ static void conf_warning(const char *fmt, ...)
conf_warnings++; conf_warnings++;
} }
static void conf_default_message_callback(const char *fmt, va_list ap) static void conf_default_message_callback(const char *s)
{ {
printf("#\n# "); printf("#\n# ");
vprintf(fmt, ap); printf("%s", s);
printf("\n#\n"); printf("\n#\n");
} }
static void (*conf_message_callback) (const char *fmt, va_list ap) = static void (*conf_message_callback)(const char *s) =
conf_default_message_callback; conf_default_message_callback;
void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap)) void conf_set_message_callback(void (*fn)(const char *s))
{ {
conf_message_callback = fn; conf_message_callback = fn;
} }
@ -60,10 +60,15 @@ void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap))
static void conf_message(const char *fmt, ...) static void conf_message(const char *fmt, ...)
{ {
va_list ap; va_list ap;
char buf[4096];
if (!conf_message_callback)
return;
va_start(ap, fmt); va_start(ap, fmt);
if (conf_message_callback)
conf_message_callback(fmt, ap); vsnprintf(buf, sizeof(buf), fmt, ap);
conf_message_callback(buf);
va_end(ap); va_end(ap);
} }

2
scripts/kconfig/lkc_proto.h
View file

@ -10,7 +10,7 @@ int conf_write(const char *name);
int conf_write_autoconf(void); int conf_write_autoconf(void);
bool conf_get_changed(void); bool conf_get_changed(void);
void conf_set_changed_callback(void (*fn)(void)); void conf_set_changed_callback(void (*fn)(void));
void conf_set_message_callback(void (*fn)(const char *fmt, va_list ap)); void conf_set_message_callback(void (*fn)(const char *s));
/* menu.c */ /* menu.c */
extern struct menu rootmenu; extern struct menu rootmenu;

9
scripts/kconfig/mconf.c
View file

@ -772,16 +772,13 @@ static void show_helptext(const char *title, const char *text)
show_textbox(title, text, 0, 0); show_textbox(title, text, 0, 0);
} }
static void conf_message_callback(const char *fmt, va_list ap) static void conf_message_callback(const char *s)
{ {
char buf[PATH_MAX+1];
vsnprintf(buf, sizeof(buf), fmt, ap);
if (save_and_exit) { if (save_and_exit) {
if (!silent) if (!silent)
printf("%s", buf); printf("%s", s);
} else { } else {
show_textbox(NULL, buf, 6, 60); show_textbox(NULL, s, 6, 60);
} }
} }

7
scripts/kconfig/nconf.c
View file

@ -1210,12 +1210,9 @@ static void conf(struct menu *menu)
} }
} }
static void conf_message_callback(const char *fmt, va_list ap) static void conf_message_callback(const char *s)
{ {
char buf[1024]; btn_dialog(main_window, s, 1, "<OK>");
vsnprintf(buf, sizeof(buf), fmt, ap);
btn_dialog(main_window, buf, 1, "<OK>");
} }
static void show_help(struct menu *menu) static void show_help(struct menu *menu)