MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix-header.c (read_scan_file): Use cpp_get_callbacks and cpp_get_options rather than dereferencing pfile and...

Browse Source 
* fix-header.c (read_scan_file): Use cpp_get_callbacks and
        cpp_get_options rather than dereferencing pfile and using
        CPP_OPTION.
        * scan-decls.c (scan_decls): Use return value of
        cpp_pop_buffer rather than CPP_BUFFER.

From-SVN: r38972
This commit is contained in:
Neil Booth 2001-01-13 01:07:32 +00:00 committed by Neil Booth
parent 7e96d768fe
commit f85c14eed1
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2001-01-13 Neil Booth <neil@daikokuya.demon.co.uk>
* fix-header.c (read_scan_file): Use cpp_get_callbacks and
cpp_get_options rather than dereferencing pfile and using
CPP_OPTION.
* scan-decls.c (scan_decls): Use return value of
cpp_pop_buffer rather than CPP_BUFFER.
2001-01-13 Neil Booth <neil@daikokuya.demon.co.uk> 2001-01-13 Neil Booth <neil@daikokuya.demon.co.uk>
* cppinit.c (cpp_handle_option): help_only is now part of the * cppinit.c (cpp_handle_option): help_only is now part of the

11
gcc/fix-header.c
View File

@ -613,6 +613,8 @@ read_scan_file (in_fname, argc, argv)
char **argv; char **argv;
{ {
cpp_reader* scan_in; cpp_reader* scan_in;
cpp_callbacks *cb;
cpp_options *options;
struct fn_decl *fn; struct fn_decl *fn;
int i; int i;
register struct symbol_list *cur_symbols; register struct symbol_list *cur_symbols;
@ -620,12 +622,15 @@ read_scan_file (in_fname, argc, argv)
obstack_init (&scan_file_obstack); obstack_init (&scan_file_obstack);
scan_in = cpp_create_reader (CLK_GNUC89); scan_in = cpp_create_reader (CLK_GNUC89);
scan_in->cb.file_change = cb_file_change; cb = cpp_get_callbacks (scan_in);
cb->file_change = cb_file_change;
/* We are going to be scanning a header file out of its proper context, /* We are going to be scanning a header file out of its proper context,
so ignore warnings and errors. */ so ignore warnings and errors. */
CPP_OPTION (scan_in, inhibit_warnings) = 1; options = cpp_get_options (pfile);
CPP_OPTION (scan_in, inhibit_errors) = 1; options->inhibit_warnings = 1;
options->inhibit_errors = 1;
i = cpp_handle_options (scan_in, argc, argv); i = cpp_handle_options (scan_in, argc, argv);
if (i < argc && ! CPP_FATAL_ERRORS (scan_in)) if (i < argc && ! CPP_FATAL_ERRORS (scan_in))
cpp_fatal (scan_in, "Invalid option `%s'", argv[i]); cpp_fatal (scan_in, "Invalid option `%s'", argv[i]);

6
gcc/scan-decls.c
View File

@ -113,8 +113,7 @@ scan_decls (pfile, argc, argv)
} }
if (token.type == CPP_EOF) if (token.type == CPP_EOF)
{ {
cpp_pop_buffer (pfile); if (cpp_pop_buffer (pfile) == 0)
if (CPP_BUFFER (pfile) == NULL)
return 0; return 0;
goto new_statement; goto new_statement;
@ -149,8 +148,7 @@ scan_decls (pfile, argc, argv)
goto new_statement; goto new_statement;
case CPP_EOF: case CPP_EOF:
cpp_pop_buffer (pfile); if (cpp_pop_buffer (pfile) == 0)
if (CPP_BUFFER (pfile) == NULL)
return 0; return 0;
break; break;