Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 2010-10-30 Alexander Williams <[email protected]>
- Index: gcc/c-format.c
- ===================================================================
- --- gcc/c-format.c
- +++ gcc/c-format.c (working copy)
- @@ -184,7 +184,7 @@
- if (TREE_CODE (format_type_id) != IDENTIFIER_NODE)
- {
- gcc_assert (!validated_p);
- - error ("unrecognized format specifier");
- + error ("%Junrecognized format specifier", lang_hooks.decls.getdecls ());
- return false;
- }
- else
- @@ -531,6 +531,26 @@
- { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL }
- };
- +static const format_char_info fbsd_ext_char_info =
- +{ NULL, 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "cR", NULL };
- +
- +static const format_char_info fbsd_print_char_table[] =
- +{
- + /* BSD conversion specifiers. */
- + /* FreeBSD kernel extensions (src/sys/kern/subr_prf.c).
- + The format %b is supported to decode error registers.
- + Its usage is: printf("reg=%b\n", regval, "<base><arg>*");
- + which produces: reg=3<BITTWO,BITONE>
- + The format %D provides a hexdump given a pointer and separator string:
- + ("%6D", ptr, ":") -> XX:XX:XX:XX:XX:XX
- + ("%*D", len, ptr, " ") -> XX XX XX XX ...
- + */
- + { "D", 1, STD_EXT, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", &fbsd_ext_char_info },
- + { "b", 0, STD_EXT, { T89_I, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "", &fbsd_ext_char_info },
- + { "ry", 0, STD_EXT, { T89_I, BADLEN, BADLEN, T89_L, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "i", NULL },
- + { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL }
- +};
- +
- static const format_char_info asm_fprintf_char_table[] =
- {
- /* C89 conversion specifiers. */
- @@ -766,6 +786,12 @@
- strfmon_flag_specs, strfmon_flag_pairs,
- FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L', 0,
- NULL, NULL
- + },
- + { "printf0", printf_length_specs, print_char_table, " +#0-'I", NULL,
- + printf_flag_specs, printf_flag_pairs,
- + FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK|FMT_FLAG_NULL_FORMAT_OK,
- + 'w', 0, 'p', 0, 'L', 0,
- + &integer_type_node, &integer_type_node
- }
- };
- @@ -1778,6 +1804,14 @@
- while (fli->name != 0
- && strncmp (fli->name, format_chars, strlen (fli->name)))
- fli++;
- + /*
- + * Make sure FreeBSD's D format char takes preference
- + * over new DD length specifier if FreeBSD format
- + * extensions are requested.
- + */
- + if (fli->index == FMT_LEN_D && flag_format_extensions
- + && fki->conversion_specs == print_char_table)
- + while (fli->name != 0) fli++;
- if (fli->name != 0)
- {
- format_chars += strlen (fli->name);
- @@ -1845,6 +1879,14 @@
- while (fci->format_chars != 0
- && strchr (fci->format_chars, format_char) == 0)
- ++fci;
- + if (fci->format_chars == 0 && flag_format_extensions
- + && fki->conversion_specs == print_char_table)
- + {
- + fci = fbsd_print_char_table;
- + while (fci->format_chars != 0
- + && strchr (fci->format_chars, format_char) == 0)
- + ++fci;
- + }
- if (fci->format_chars == 0)
- {
- if (ISGRAPH (format_char))
- @@ -1964,7 +2006,7 @@
- y2k_level = 2;
- if (y2k_level == 3)
- warning (OPT_Wformat_y2k, "%<%%%c%> yields only last 2 digits of "
- - "year in some locales", format_char);
- + "year in some locales on non-BSD systems", format_char);
- else if (y2k_level == 2)
- warning (OPT_Wformat_y2k, "%<%%%c%> yields only last 2 digits of "
- "year", format_char);
- y2k_level = 2;
- if (y2k_level == 3)
- warning (OPT_Wformat_y2k, "%<%%%c%> yields only last 2 digits of "
- - "year in some locales", format_char);
- + "year in some locales on non-BSD systems", format_char);
- else if (y2k_level == 2)
- warning (OPT_Wformat_y2k, "%<%%%c%> yields only last 2 digits of "
- "year", format_char);
Advertisement
Add Comment
Please, Sign In to add comment