diff options
author | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-04-30 12:54:29 +0000 |
---|---|---|
committer | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-04-30 12:54:29 +0000 |
commit | 3085426c6774a168d6fee698192da3f0bc581878 (patch) | |
tree | a2666498880556a83ff9f0c75bb3670739099bdc /gcc/diagnostic.c | |
parent | c4327e0e7ee34321b7d9fa2b8bb89bcc9c1a65dd (diff) | |
download | gcc-3085426c6774a168d6fee698192da3f0bc581878.tar.gz |
* diagnostic.h (output_formatted_scalar): Tweak.
* diagnostic.c (output_long_decimal): Likewise.
(output_unsigned_decimal): Likewise.
(output_long_unsigned_decimal): Likewise.
(output_octal): Likewise.
(output_long_octal): Likewise.
(output_hexadecimal): Likewise.
(output_long_hexadecimal): Likewise.
(output_pointer): New function.
(output_format): Use it. Recognize "%p" format specifier.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66287 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/diagnostic.c')
-rw-r--r-- | gcc/diagnostic.c | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index 21d78a95dc5..901484a1243 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -307,62 +307,54 @@ output_decimal (buffer, i) output_formatted_scalar (buffer, "%d", i); } -static void -output_long_decimal (buffer, i) - output_buffer *buffer; - long int i; +static inline void +output_long_decimal (output_buffer *buffer, long int i) { output_formatted_scalar (buffer, "%ld", i); } -static void -output_unsigned_decimal (buffer, i) - output_buffer *buffer; - unsigned int i; +static inline void +output_unsigned_decimal (output_buffer *buffer, unsigned int i) { output_formatted_scalar (buffer, "%u", i); } -static void -output_long_unsigned_decimal (buffer, i) - output_buffer *buffer; - long unsigned int i; +static inline void +output_long_unsigned_decimal (output_buffer *buffer, long unsigned int i) { output_formatted_scalar (buffer, "%lu", i); } -static void -output_octal (buffer, i) - output_buffer *buffer; - unsigned int i; +static inline void +output_octal (output_buffer *buffer, unsigned int i) { output_formatted_scalar (buffer, "%o", i); } -static void -output_long_octal (buffer, i) - output_buffer *buffer; - unsigned long int i; +static inline void +output_long_octal (output_buffer *buffer, long unsigned int i) { output_formatted_scalar (buffer, "%lo", i); } -static void -output_hexadecimal (buffer, i) - output_buffer *buffer; - unsigned int i; +static inline void +output_hexadecimal (output_buffer *buffer, unsigned int i) { output_formatted_scalar (buffer, "%x", i); } -static void -output_long_hexadecimal (buffer, i) - output_buffer *buffer; - unsigned long int i; +static inline void +output_long_hexadecimal (output_buffer *buffer, long unsigned int i) { output_formatted_scalar (buffer, "%lx", i); } +static inline void +output_pointer (output_buffer *buffer, void *p) +{ + output_formatted_scalar (buffer, "%p", p); +} + /* Append to BUFFER a string specified by its STARTING character and LENGTH. */ static void @@ -497,6 +489,7 @@ output_buffer_to_stream (buffer) %ld, %li, %lo, %lu, %lx: long versions of the above. %c: character. %s: string. + %p: pointer. %%: `%'. %*.s: a substring the length of which is specified by an integer. %H: location_t. */ @@ -530,7 +523,7 @@ output_format (buffer, text) } /* Handle %c, %d, %i, %ld, %li, %lo, %lu, %lx, %o, %s, %u, - %x, %.*s; %%. And nothing else. Front-ends should install + %x, %p, %.*s; %%. And nothing else. Front-ends should install printers to grok language specific format specifiers. */ switch (*text->format_spec) { @@ -558,6 +551,10 @@ output_format (buffer, text) output_add_string (buffer, va_arg (*text->args_ptr, const char *)); break; + case 'p': + output_pointer (buffer, va_arg (*text->args_ptr, void *)); + break; + case 'u': if (long_integer) output_long_unsigned_decimal |