kconfig: handle format string before calling conf_message_callback()

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>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/config/confdata.c b/config/confdata.c
index 481b07b10eb9191fe4dde158e9feb43770b246fb..57b57aa182b15b0f73e76b2c75bb34a459486550 100644 (file)
--- a/config/confdata.c
+++ b/config/confdata.c
@@ -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, ...)
 {
        va_list ap;
 static void conf_message(const char *fmt, ...)
 {
        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);
 }
 

diff --git a/config/lkc_proto.h b/config/lkc_proto.h
index a8b7a330587e80f45a0bce6714445b3ef0ac51b1..cf4510a2bdc71e5f91d628d77b2d69b4cc8edb37 100644 (file)
--- a/config/lkc_proto.h
+++ b/config/lkc_proto.h
@@ -10,7 +10,7 @@ int conf_write(const char *name);
 int conf_write_autoconf(void);
 bool conf_get_changed(void);
 void conf_set_changed_callback(void (*fn)(void));
 int conf_write_autoconf(void);
 bool conf_get_changed(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 */
 extern struct menu rootmenu;
 
 /* menu.c */
 extern struct menu rootmenu;