| Message ID | 1513351722-14196-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | e3b03bf29d6b99fab7001fb20c33fe54928c157a |
| Headers | show |
| Series | kconfig: display recursive dependency resolution hint just once | expand |
On Sat, Dec 16, 2017 at 12:28:42AM +0900, Masahiro Yamada wrote: > 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" > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Luis R. Rodriguez <mcgrof@kernel.org> Luis
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 3c8bd9b..35e0937 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -1150,8 +1150,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, @@ -1181,6 +1180,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(); }
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" Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/kconfig/symbol.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.7.4