kconfig: remove duplicated file name and lineno of recursive inclusion

[carl9170fw.git] / config / zconf.l

diff --git a/config/zconf.l b/config/zconf.l
index 7578853e7238c0401e546b2cfc80b0bd59916f1e..0e8b892ba68303899890321b9c02341e166a4bae 100644 (file)
--- a/config/zconf.l
+++ b/config/zconf.l
@@ -328,20 +328,15 @@ 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());
-                       iter = current_file->parent;
-                       while (iter && \
-                              strcmp(iter->name,current_file->name)) {
-                               fprintf(stderr, "  included from: '%s:%d'\n",
-                                       iter->name, iter->lineno-1);
+                               "Recursive inclusion detected.\n"
+                               "Inclusion path:\n"
+                               "  current file : %s\n", zconf_curname());
+                       iter = current_file;
+                       do {
                                iter = iter->parent;
-                       }
-                       if (iter)
-                               fprintf(stderr, "  included from: '%s:%d'\n",
-                                       iter->name, iter->lineno+1);
+                               fprintf(stderr, "  included from: %s:%d\n",
+                                       iter->name, iter->lineno - 1);
+                       } while (strcmp(iter->name, current_file->name));
                        exit(1);
                }
        }