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