Update

[l4.git] / l4 / tool / kconfig / scripts / kconfig / confdata.c

diff --git a/l4/tool/kconfig/scripts/kconfig/confdata.c b/l4/tool/kconfig/scripts/kconfig/confdata.c
index ce43d30f541b5325371d10f03eed370e4323ae45..c66497805acaf2dfadc6884dc93340b1da6b6f5a 100644 (file)
--- a/l4/tool/kconfig/scripts/kconfig/confdata.c
+++ b/l4/tool/kconfig/scripts/kconfig/confdata.c
@@ -16,6 +16,11 @@
 
 #include "lkc.h"
 
+struct conf_printer {
+       void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
+       void (*print_comment)(FILE *, const char *, void *);
+};
+
 static void conf_warning(const char *fmt, ...)
        __attribute__ ((format (printf, 1, 2)));
 
@@ -59,6 +64,7 @@ static void conf_message(const char *fmt, ...)
        va_start(ap, fmt);
        if (conf_message_callback)
                conf_message_callback(fmt, ap);
+       va_end(ap);
 }
 
 const char *conf_get_configname(void)
@@ -262,8 +268,7 @@ int conf_read_simple(const char *name, int def)
                        goto load;
                sym_add_change_count(1);
                if (!sym_defconfig_list) {
-                       if (modules_sym)
-                               sym_calc_value(modules_sym);
+                       sym_calc_value(modules_sym);
                        return 1;
                }
 
@@ -398,8 +403,6 @@ setsym:
        }
        free(line);
        fclose(in);
-
-       if (modules_sym)
                sym_calc_value(modules_sym);
        return 0;
 }