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
2020 struct file *parent;
2121 const char *name;
2222 int lineno;
23− int flags;
2423 };
2524
26−#define FILE_BUSY 0x0001
27−#define FILE_SCANNED 0x0002
28−
2925 typedef enum tristate {
3026 no, mod, yes
3127 } tristate;
scripts/kconfig/lex.zconf.c_shipped+0−4
@@ -2363,7 +2363,6 @@ void zconf_initscan(const char *name) · 2362 unmodified lines
23632363
23642364 current_file = file_lookup(name);
23652365 current_file->lineno = 1;
2366− current_file->flags = FILE_BUSY;
23672366 }
23682367
23692368 void zconf_nextfile(const char *name)
@@ -2403,7 +2402,6 @@ void zconf_nextfile(const char *name) · 33 unmodified lines
24032402 exit(1);
24042403 }
24052404 }
2406− file->flags |= FILE_BUSY;
24072405 file->lineno = 1;
24082406 file->parent = current_file;
24092407 current_file = file;
@@ -2413,8 +2411,6 @@ static void zconf_endfile(void) · 3 unmodified lines
24132411 {
24142412 struct buffer *parent;
24152413
2416− current_file->flags |= FILE_SCANNED;
2417− current_file->flags &= ~FILE_BUSY;
24182414 current_file = current_file->parent;
24192415
24202416 parent = current_buf->parent;
scripts/kconfig/zconf.l+0−4
@@ -294,7 +294,6 @@ void zconf_initscan(const char *name) · 293 unmodified lines
294294
295295 current_file = file_lookup(name);
296296 current_file->lineno = 1;
297− current_file->flags = FILE_BUSY;
298297 }
299298
300299 void zconf_nextfile(const char *name)
@@ -334,7 +333,6 @@ void zconf_nextfile(const char *name) · 33 unmodified lines
334333 exit(1);
335334 }
336335 }
337− file->flags |= FILE_BUSY;
338336 file->lineno = 1;
339337 file->parent = current_file;
340338 current_file = file;
@@ -344,8 +342,6 @@ static void zconf_endfile(void) · 3 unmodified lines
344342 {
345343 struct buffer *parent;
346344
347− current_file->flags |= FILE_SCANNED;
348− current_file->flags &= ~FILE_BUSY;
349345 current_file = current_file->parent;
350346
351347 parent = current_buf->parent;