kconfig: clean-up reverse dependency help implementation

[carl9170fw.git] / config / expr.c

diff --git a/config/expr.c b/config/expr.c
index 2ba332b3fed788f6bbdceb707b2a5bf8938feca1..cd3a8f501f38e1c3d6290bd4c34572943e3fc793 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,9 @@ struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2)
        return expr_get_leftmost_symbol(ret);
 }
 
-static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken, bool revdep)
+void expr_print(struct expr *e,
+               void (*fn)(void *, struct symbol *, const char *),
+               void *data, int prevtoken)
 {
        if (!e) {
                fn(data, NULL, "y");
@@ -1234,14 +1236,9 @@ static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, con
                fn(data, e->right.sym, e->right.sym->name);
                break;
        case 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);
+               expr_print(e->left.expr, fn, data, E_OR);
+               fn(data, NULL, " || ");
+               expr_print(e->right.expr, fn, data, E_OR);
                break;
        case E_AND:
                expr_print(e->left.expr, fn, data, E_AND);
@@ -1274,11 +1271,6 @@ static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, con
                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);
@@ -1329,7 +1321,21 @@ void expr_gstr_print(struct expr *e, struct gstr *gs)
  * line with a minus. This makes expressions much easier to read.
  * Suitable for reverse dependency expressions.
  */
+static void expr_print_revdep(struct expr *e,
+                             void (*fn)(void *, struct symbol *, const char *),
+                             void *data)
+{
+       if (e->type == E_OR) {
+               expr_print_revdep(e->left.expr, fn, data);
+               expr_print_revdep(e->right.expr, fn, data);
+       } else {
+               fn(data, NULL, "  - ");
+               expr_print(e, fn, data, E_NONE);
+               fn(data, NULL, "\n");
+       }
+}
+
 void expr_gstr_print_revdep(struct expr *e, struct gstr *gs)
 {
-       __expr_print(e, expr_print_gstr_helper, gs, E_NONE, true);
+       expr_print_revdep(e, expr_print_gstr_helper, gs);
 }