kconfig: send error messages to stderr

[carl9170fw.git] / config / expr.c

diff --git a/config/expr.c b/config/expr.c
index f8cb886eef9cabe9be8b6d4b55980c8e010f86eb..d45381986ac76a7d4c573b2c8e0f16ed79362f10 100644 (file)
--- a/config/expr.c
+++ b/config/expr.c
@@ -94,7 +94,7 @@ struct expr *expr_copy(const struct expr *org)
                e->right.expr = expr_copy(org->right.expr);
                break;
        default:
-               printf("can't copy type %d\n", e->type);
+               fprintf(stderr, "can't copy type %d\n", e->type);
                free(e);
                e = NULL;
                break;
@@ -127,7 +127,7 @@ void expr_free(struct expr *e)
                expr_free(e->right.expr);
                break;
        default:
-               printf("how to free type %d?\n", e->type);
+               fprintf(stderr, "how to free type %d?\n", e->type);
                break;
        }
        free(e);
@@ -1179,7 +1179,7 @@ struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2)
        return expr_get_leftmost_symbol(ret);
 }
 
-void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken)
+static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken, bool revdep)
 {
        if (!e) {
                fn(data, NULL, "y");
@@ -1234,9 +1234,14 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *
                fn(data, e->right.sym, e->right.sym->name);
                break;
        case E_OR:
-               expr_print(e->left.expr, fn, data, E_OR);
-               fn(data, NULL, " || ");
-               expr_print(e->right.expr, fn, data, E_OR);
+               if (revdep && e->left.expr->type != E_OR)
+                       fn(data, NULL, "\n  - ");
+               __expr_print(e->left.expr, fn, data, E_OR, revdep);
+               if (revdep)
+                       fn(data, NULL, "\n  - ");
+               else
+                       fn(data, NULL, " || ");
+               __expr_print(e->right.expr, fn, data, E_OR, revdep);
                break;
        case E_AND:
                expr_print(e->left.expr, fn, data, E_AND);
@@ -1269,6 +1274,11 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *
                fn(data, NULL, ")");
 }
 
+void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken)
+{
+       __expr_print(e, fn, data, prevtoken, false);
+}
+
 static void expr_print_file_helper(void *data, struct symbol *sym, const char *str)
 {
        xfwrite(str, strlen(str), 1, data);
@@ -1313,3 +1323,13 @@ void expr_gstr_print(struct expr *e, struct gstr *gs)
 {
        expr_print(e, expr_print_gstr_helper, gs, E_NONE);
 }
+
+/*
+ * Transform the top level "||" tokens into newlines and prepend each
+ * line with a minus. This makes expressions much easier to read.
+ * Suitable for reverse dependency expressions.
+ */
+void expr_gstr_print_revdep(struct expr *e, struct gstr *gs)
+{
+       __expr_print(e, expr_print_gstr_helper, gs, E_NONE, true);
+}