diff options
| author | Zack Weinberg <zack@wolery.cumb.org> | 2000-02-06 23:46:18 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-02-06 23:46:18 +0000 |
| commit | c1212d2f0998469e6b4608de078a0a47bccd4ab7 (patch) | |
| tree | 894892747a145534ab3a2d2ae699861344cb8913 /gcc/cppfiles.c | |
| parent | 25e309705ac7405b86e15bc4db7e58b7febdfdc2 (diff) | |
| download | gcc-c1212d2f0998469e6b4608de078a0a47bccd4ab7.zip gcc-c1212d2f0998469e6b4608de078a0a47bccd4ab7.tar.gz gcc-c1212d2f0998469e6b4608de078a0a47bccd4ab7.tar.bz2 | |
cpplib.c (my_strerror, [...]): Move to cpperror.c.
* cpplib.c (my_strerror, cpp_error, cpp_error_with_line,
cpp_error_from_errno, cpp_warning, cpp_warning_with_line,
cpp_pedwarn, cpp_pedwarn_with_line,
cpp_pedwarn_with_file_and_line): Move to cpperror.c.
(cpp_print_file_and_line, v_cpp_error, v_cpp_warning,
v_cpp_error_with_line, v_cpp_warning_with_line,
cpp_message_from_errno, cpp_perror_with_name): Delete.
* cpperror.c (cpp_print_containing_files): Take starting
buffer as argument.
(cpp_file_line_for_message): Rename to cpp_print_file_and_line.
(v_cpp_message): Now called directly by all entry points.
Remove -1 case.
(cpp_pfatal_with_name, cpp_message): Delete.
(cpp_notice_from_errno, cpp_ice): New functions.
(cpp_notice): Is now for reporting error conditions, just
without an associated file.
(cpp_error, cpp_error_with_line): Don't do anything if
opts->inhibit_errors is on.
(cpp_pedwarn_with_file_and_line): Take column argument also.
* cpplib.h: Update prototypes of exported functions.
(struct cpp_options): Add inhibit_errors.
* cppalloc.c, cppfiles.c: Use fprintf not cpp_notice for
non-error messages. Include intl.h.
* cppinit.c, cppmain.c: Likewise. Also, use
cpp_notice_from_errno instead of cpp_perror_with_name or
cpp_pfatal_with_name, and cpp_notice instead of cpp_message.
* cppexp.c, cpphash.c, cppinit.c, cpplib.c: Use cpp_ice to
report internal errors.
* cpplib.c (do_define): Switch bcopy to memcpy.
Give cpp_pedwarn_with_file_and_line a dummy column argument.
From-SVN: r31829
Diffstat (limited to 'gcc/cppfiles.c')
| -rw-r--r-- | gcc/cppfiles.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index 36e3305..c5e1b18 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -26,6 +26,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "config.h" #include "system.h" #include "cpplib.h" +#include "intl.h" /* The entry points to this file are: find_include_file, finclude, include_hash, append_include_chain, deps_output, and file_cleanup. @@ -126,7 +127,8 @@ merge_include_chains (opts) && cur->dev == other->dev) { if (opts->verbose) - cpp_notice ("ignoring duplicate directory `%s'\n", cur->name); + fprintf (stderr, _("ignoring duplicate directory `%s'\n"), + cur->name); prev->next = cur->next; free (cur->name); @@ -145,7 +147,8 @@ merge_include_chains (opts) && cur->dev == other->dev) { if (opts->verbose) - cpp_notice ("ignoring duplicate directory `%s'\n", cur->name); + fprintf (stderr, _("ignoring duplicate directory `%s'\n"), + cur->name); prev->next = cur->next; free (cur->name); @@ -163,8 +166,8 @@ merge_include_chains (opts) if (quote == qtail) { if (opts->verbose) - cpp_notice ("ignoring duplicate directory `%s'\n", - quote->name); + fprintf (stderr, _("ignoring duplicate directory `%s'\n"), + quote->name); free (quote->name); free (quote); @@ -177,8 +180,8 @@ merge_include_chains (opts) cur = cur->next; cur->next = brack; if (opts->verbose) - cpp_notice ("ignoring duplicate directory `%s'\n", - qtail->name); + fprintf (stderr, _("ignoring duplicate directory `%s'\n"), + qtail->name); free (qtail->name); free (qtail); |