diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-12-16 00:28:42 +0900 |
|---|---|---|
| committer | Timi Rautamäki <timi.rautamaki@gmail.com> | 2023-11-06 15:42:11 +0000 |
| commit | a564e9b7f384bf1b3f0036bb105e93feae0a0020 (patch) | |
| tree | 6ee6505826860151a50a1e249725aebd22c98a7a | |
| parent | 9f9dff79a3b47de03b5c05a6a146f1956f43f738 (diff) | |
kconfig: display recursive dependency resolution hint just once
Commit 1c199f2878f6 ("kbuild: document recursive dependency limitation
/ resolution") probably intended to show a hint along with "recursive
dependency detected!" error, but it missed to add {...} guard, and the
hint is displayed in every loop of the dep_stack traverse, annoyingly.
This error was detected by GCC's -Wmisleading-indentation when switching
to build-time generation of lexer/parser.
scripts/kconfig/symbol.c: In function ‘sym_check_print_recursive’:
scripts/kconfig/symbol.c:1150:3: warning: this ‘if’ clause does not
guard... [-Wmisleading-indentation]
if (stack->sym == last_sym)
^~
scripts/kconfig/symbol.c:1153:4: note: ...this statement, but the latter
is misleadingly indented as if it were guarded by the ‘if’
fprintf(stderr, "For a resolution refer to
Documentation/kbuild/kconfig-language.txt\n");
^~~~~~~
I could simply add {...} to surround the three fprintf(), but I rather
chose to move the hint after the loop to make the whole message
readable.
Fixes: 1c199f2878f6 ("kbuild: document recursive dependency limitation /
resolution"
Change-Id: I87e5440b694922b79fc5b8ba0800ec4fa245be01
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
| -rw-r--r-- | scripts/kconfig/symbol.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 25cf0c2c0c79..e5113941c961 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -1116,8 +1116,7 @@ static void sym_check_print_recursive(struct symbol *last_sym) if (stack->sym == last_sym) fprintf(stderr, "%s:%d:error: recursive dependency detected!\n", prop->file->name, prop->lineno); - fprintf(stderr, "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n"); - fprintf(stderr, "subsection \"Kconfig recursive dependency limitations\"\n"); + if (stack->expr) { fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n", prop->file->name, prop->lineno, @@ -1147,6 +1146,11 @@ static void sym_check_print_recursive(struct symbol *last_sym) } } + fprintf(stderr, + "For a resolution refer to Documentation/kbuild/kconfig-language.txt\n" + "subsection \"Kconfig recursive dependency limitations\"\n" + "\n"); + if (check_top == &cv_stack) dep_stack_remove(); } |