History

kconfig: get rid of unused flags

Now that we detect recusrion of sourced files, get rid of now unused flags. Regenerate lex.zconf.c_shipped file.

Yann E. MORIN committed 15 years ago

Commit 2b2112f1 parent f094f8a3 files · +0 −12Browse files

Unified · Split

3 files
  1. scripts/kconfig/expr.h +0 −4
  2. scripts/kconfig/lex.zconf.c_shipped +0 −4
  3. scripts/kconfig/zconf.l +0 −4
scripts/kconfig/expr.h+0−4
@@ -20,12 +20,8 @@ struct file { · 19 unmodified lines
20 struct file *parent;20 struct file *parent;
21 const char *name;21 const char *name;
22 int lineno;22 int lineno;
23 int flags;
24};23};
25 24
26#define FILE_BUSY 0x0001
27#define FILE_SCANNED 0x0002
28
29typedef enum tristate {25typedef enum tristate {
30 no, mod, yes26 no, mod, yes
31} tristate;27} tristate;
scripts/kconfig/lex.zconf.c_shipped+0−4
@@ -2363,7 +2363,6 @@ void zconf_initscan(const char *name) · 2362 unmodified lines
2363 2363
2364 current_file = file_lookup(name);2364 current_file = file_lookup(name);
2365 current_file->lineno = 1;2365 current_file->lineno = 1;
2366 current_file->flags = FILE_BUSY;
2367}2366}
2368 2367
2369void zconf_nextfile(const char *name)2368void zconf_nextfile(const char *name)
@@ -2403,7 +2402,6 @@ void zconf_nextfile(const char *name) · 33 unmodified lines
2403 exit(1);2402 exit(1);
2404 }2403 }
2405 }2404 }
2406 file->flags |= FILE_BUSY;
2407 file->lineno = 1;2405 file->lineno = 1;
2408 file->parent = current_file;2406 file->parent = current_file;
2409 current_file = file;2407 current_file = file;
@@ -2413,8 +2411,6 @@ static void zconf_endfile(void) · 3 unmodified lines
2413{2411{
2414 struct buffer *parent;2412 struct buffer *parent;
2415 2413
2416 current_file->flags |= FILE_SCANNED;
2417 current_file->flags &= ~FILE_BUSY;
2418 current_file = current_file->parent;2414 current_file = current_file->parent;
2419 2415
2420 parent = current_buf->parent;2416 parent = current_buf->parent;
scripts/kconfig/zconf.l+0−4
@@ -294,7 +294,6 @@ void zconf_initscan(const char *name) · 293 unmodified lines
294 294
295 current_file = file_lookup(name);295 current_file = file_lookup(name);
296 current_file->lineno = 1;296 current_file->lineno = 1;
297 current_file->flags = FILE_BUSY;
298}297}
299 298
300void zconf_nextfile(const char *name)299void zconf_nextfile(const char *name)
@@ -334,7 +333,6 @@ void zconf_nextfile(const char *name) · 33 unmodified lines
334 exit(1);333 exit(1);
335 }334 }
336 }335 }
337 file->flags |= FILE_BUSY;
338 file->lineno = 1;336 file->lineno = 1;
339 file->parent = current_file;337 file->parent = current_file;
340 current_file = file;338 current_file = file;
@@ -344,8 +342,6 @@ static void zconf_endfile(void) · 3 unmodified lines
344{342{
345 struct buffer *parent;343 struct buffer *parent;
346 344
347 current_file->flags |= FILE_SCANNED;
348 current_file->flags &= ~FILE_BUSY;
349 current_file = current_file->parent;345 current_file = current_file->parent;
350 346
351 parent = current_buf->parent;347 parent = current_buf->parent;