aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@anciens.enib.fr>2011-02-24 13:36:43 -0500
committerMichal Marek <mmarek@suse.cz>2011-04-15 09:12:57 -0400
commit2b2112f617e8ca600ec24271c93bbd49aa2acce4 (patch)
tree892a8451eb984e18f532e4f3fccaeab63e298a7a /scripts
parentf094f8a1b2737a4f3ca46742ff9aaf460d39285e (diff)
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. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/expr.h4
-rw-r--r--scripts/kconfig/lex.zconf.c_shipped4
-rw-r--r--scripts/kconfig/zconf.l4
3 files changed, 0 insertions, 12 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 3d238db49764..16bfae2d3217 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -20,12 +20,8 @@ struct file {
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, yes 26 no, mod, yes
31} tristate; 27} tristate;
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index f4b3b1a15e21..d9182916f724 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -2363,7 +2363,6 @@ void zconf_initscan(const char *name)
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)
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)
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;
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index f23e3affa9b5..b22f884f9022 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -294,7 +294,6 @@ void zconf_initscan(const char *name)
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)
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)
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;