diff options
| author | Per Bothner <pbothner@apple.com> | 2003-10-02 07:20:38 +0000 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2003-10-02 00:20:38 -0700 |
| commit | a506c55cb1000de54bb5a2907e10f31113c46133 (patch) | |
| tree | 556b83797cd04698faea5798a63e42ef3fda0c52 /gcc/cpptrad.c | |
| parent | fddb33d2cd74d9bfd6951802ea075ad122ad1571 (diff) | |
| download | gcc-a506c55cb1000de54bb5a2907e10f31113c46133.zip gcc-a506c55cb1000de54bb5a2907e10f31113c46133.tar.gz gcc-a506c55cb1000de54bb5a2907e10f31113c46133.tar.bz2 | |
cpplex.c (_cpp_get_fresh_line): Revert my no-longer-needed 08-28 change...
* cpplex.c (_cpp_get_fresh_line): Revert my no-longer-needed
08-28 change, since we're never called with a NULL buffer.
(_cpp_lex_direct): Likewise.
* cpptrad.c (_cpp_read_logical_line_trad): Likewise.
Return false if buffer is NULL at end.
* cpplex.c (_cpp_get_fresh_line): Return value now just depends on
whether pfile->buffer is NULL after pop, ignoring return_at_eof.
From-SVN: r72013
Diffstat (limited to 'gcc/cpptrad.c')
| -rw-r--r-- | gcc/cpptrad.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/cpptrad.c b/gcc/cpptrad.c index 3c1bc25..e2ccb0b 100644 --- a/gcc/cpptrad.c +++ b/gcc/cpptrad.c @@ -299,13 +299,12 @@ _cpp_read_logical_line_trad (cpp_reader *pfile) { do { - if ((pfile->buffer == NULL || pfile->buffer->need_line) - && !_cpp_get_fresh_line (pfile)) + if (pfile->buffer->need_line && !_cpp_get_fresh_line (pfile)) return false; } while (!_cpp_scan_out_logical_line (pfile, NULL) || pfile->state.skipping); - return true; + return pfile->buffer != NULL; } /* Set up state for finding the opening '(' of a function-like |