kconfig: remove duplicated file name and lineno of recursive inclusion (32a94b8b) · Commits · 戴 / test

As in the unit test, the error message for the recursive inclusion looks like this: Kconfig.inc1:4: recursive inclusion detected. Inclusion path: current file : 'Kconfig.inc1' included from: 'Kconfig.inc3:1' included from: 'Kconfig.inc2:3' included from: 'Kconfig.inc1:4' The 'Kconfig.inc1:4' is duplicated in the first and last lines. Also, the single quotes do not help readability. Change the message like follows: Recursive inclusion detected. Inclusion path: current file : Kconfig.inc1 included from: Kconfig.inc3:1 included from: Kconfig.inc2:3 included from: Kconfig.inc1:4 Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com>

scripts/kconfig/tests/err_recursive_inc/expected_stderr

+6 −5

Original line number	Diff line number	Diff line
		Kconfig.inc1:4: recursive inclusion detected. Inclusion path:
		current file : 'Kconfig.inc1'
		included from: 'Kconfig.inc3:1'
		included from: 'Kconfig.inc2:3'
		included from: 'Kconfig.inc1:4'
		Recursive inclusion detected.
		Inclusion path:
		current file : Kconfig.inc1
		included from: Kconfig.inc3:1
		included from: Kconfig.inc2:3
		included from: Kconfig.inc1:4

scripts/kconfig/zconf.l

+4 −5

Original line number	Diff line number	Diff line
		@@ -328,14 +328,13 @@ void zconf_nextfile(const char *name)
		for (iter = current_file->parent; iter; iter = iter->parent ) {
		if (!strcmp(current_file->name,iter->name) ) {
		fprintf(stderr,
		"%s:%d: recursive inclusion detected. "
		"Inclusion path:\n current file : '%s'\n",
		zconf_curname(), zconf_lineno(),
		zconf_curname());
		"Recursive inclusion detected.\n"
		"Inclusion path:\n"
		" current file : %s\n", zconf_curname());
		iter = current_file;
		do {
		iter = iter->parent;
		fprintf(stderr, " included from: '%s:%d'\n",
		fprintf(stderr, " included from: %s:%d\n",
		iter->name, iter->lineno - 1);
		} while (strcmp(iter->name, current_file->name));
		exit(1);

Admin message