mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-31 21:57:12 +00:00
243 lines
8.4 KiB
Plaintext
243 lines
8.4 KiB
Plaintext
--- gcc/c-common.c.orig Thu Nov 16 22:05:12 2000
|
|
+++ gcc/c-common.c Mon Nov 27 02:25:55 2000
|
|
@@ -193,7 +193,7 @@
|
|
int, int, int));
|
|
static void init_attributes PARAMS ((void));
|
|
static void record_function_format PARAMS ((tree, tree, enum format_type,
|
|
- int, int));
|
|
+ int, int, int));
|
|
static void record_international_format PARAMS ((tree, tree, int));
|
|
static int default_valid_lang_attribute PARAMS ((tree, tree, tree, tree));
|
|
|
|
@@ -888,6 +888,7 @@
|
|
enum format_type format_type;
|
|
tree argument;
|
|
unsigned int arg_num;
|
|
+ int null_format_ok;
|
|
|
|
if (TREE_CODE (decl) != FUNCTION_DECL)
|
|
{
|
|
@@ -898,7 +899,7 @@
|
|
|
|
if (TREE_CODE (format_type_id) != IDENTIFIER_NODE)
|
|
{
|
|
- error ("unrecognized format specifier");
|
|
+ error_with_decl (decl, "unrecognized format specifier");
|
|
continue;
|
|
}
|
|
else
|
|
@@ -906,12 +907,26 @@
|
|
const char *p = IDENTIFIER_POINTER (format_type_id);
|
|
|
|
if (!strcmp (p, "printf") || !strcmp (p, "__printf__"))
|
|
+ {
|
|
+ format_type = printf_format_type;
|
|
+ null_format_ok = 0;
|
|
+ }
|
|
+ else if (!strcmp (p, "printf0") || !strcmp (p, "__printf0__"))
|
|
+ {
|
|
format_type = printf_format_type;
|
|
+ null_format_ok = 1;
|
|
+ }
|
|
else if (!strcmp (p, "scanf") || !strcmp (p, "__scanf__"))
|
|
+ {
|
|
format_type = scanf_format_type;
|
|
+ null_format_ok = 0;
|
|
+ }
|
|
else if (!strcmp (p, "strftime")
|
|
|| !strcmp (p, "__strftime__"))
|
|
+ {
|
|
format_type = strftime_format_type;
|
|
+ null_format_ok = 0;
|
|
+ }
|
|
else
|
|
{
|
|
warning ("`%s' is an unrecognized format function type", p);
|
|
@@ -990,7 +1005,8 @@
|
|
|
|
record_function_format (DECL_NAME (decl),
|
|
DECL_ASSEMBLER_NAME (decl),
|
|
- format_type, format_num, first_arg_num);
|
|
+ format_type, format_num, first_arg_num,
|
|
+ null_format_ok);
|
|
break;
|
|
}
|
|
|
|
@@ -1654,6 +1670,13 @@
|
|
|
|
static const format_char_info print_char_table[] =
|
|
{
|
|
+#ifdef XXX_NEED_TO_UPDATE_THIS_FOR_GCC297_CHANGES
|
|
+/* FreeBSD kernel extensions. */
|
|
+ { "D", 1, T_C, T_C, NULL, NULL, NULL, NULL, NULL, "-wp" },
|
|
+ { "b", 1, T_C, T_C, NULL, NULL, NULL, NULL, NULL, "-wp" },
|
|
+ { "rz", 0, NULL, T_I, T_I, T_L, NULL, NULL, NULL, "-wp0 +#" },
|
|
+#define unextended_print_char_table (print_char_table + 3)
|
|
+#endif
|
|
/* C89 conversion specifiers. */
|
|
{ "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T99_LL, TEX_LL, T99_SST, T99_PD, T99_IM }, "-wp0 +'I", "i" },
|
|
{ "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T99_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0#", "i" },
|
|
@@ -1752,6 +1775,7 @@
|
|
enum format_type format_type; /* type of format (printf, scanf, etc.) */
|
|
int format_num; /* number of format argument */
|
|
int first_arg_num; /* number of first arg (zero for varargs) */
|
|
+ int null_format_ok; /* TRUE if the format string may be NULL */
|
|
} function_format_info;
|
|
|
|
static function_format_info *function_format_list = NULL;
|
|
@@ -1837,42 +1861,42 @@
|
|
{
|
|
/* Functions from ISO/IEC 9899:1990. */
|
|
record_function_format (get_identifier ("printf"), NULL_TREE,
|
|
- printf_format_type, 1, 2);
|
|
+ printf_format_type, 1, 2, 0);
|
|
record_function_format (get_identifier ("__builtin_printf"), NULL_TREE,
|
|
- printf_format_type, 1, 2);
|
|
+ printf_format_type, 1, 2, 0);
|
|
record_function_format (get_identifier ("fprintf"), NULL_TREE,
|
|
- printf_format_type, 2, 3);
|
|
+ printf_format_type, 2, 3, 0);
|
|
record_function_format (get_identifier ("sprintf"), NULL_TREE,
|
|
- printf_format_type, 2, 3);
|
|
+ printf_format_type, 2, 3, 0);
|
|
record_function_format (get_identifier ("scanf"), NULL_TREE,
|
|
- scanf_format_type, 1, 2);
|
|
+ scanf_format_type, 1, 2, 0);
|
|
record_function_format (get_identifier ("fscanf"), NULL_TREE,
|
|
- scanf_format_type, 2, 3);
|
|
+ scanf_format_type, 2, 3, 0);
|
|
record_function_format (get_identifier ("sscanf"), NULL_TREE,
|
|
- scanf_format_type, 2, 3);
|
|
+ scanf_format_type, 2, 3, 0);
|
|
record_function_format (get_identifier ("vprintf"), NULL_TREE,
|
|
- printf_format_type, 1, 0);
|
|
+ printf_format_type, 1, 0, 0);
|
|
record_function_format (get_identifier ("vfprintf"), NULL_TREE,
|
|
- printf_format_type, 2, 0);
|
|
+ printf_format_type, 2, 0, 0);
|
|
record_function_format (get_identifier ("vsprintf"), NULL_TREE,
|
|
- printf_format_type, 2, 0);
|
|
+ printf_format_type, 2, 0, 0);
|
|
record_function_format (get_identifier ("strftime"), NULL_TREE,
|
|
- strftime_format_type, 3, 0);
|
|
+ strftime_format_type, 3, 0, 0);
|
|
}
|
|
|
|
if (flag_hosted && flag_isoc99)
|
|
{
|
|
/* ISO C99 adds the snprintf and vscanf family functions. */
|
|
record_function_format (get_identifier ("snprintf"), NULL_TREE,
|
|
- printf_format_type, 3, 4);
|
|
+ printf_format_type, 3, 4, 0);
|
|
record_function_format (get_identifier ("vsnprintf"), NULL_TREE,
|
|
- printf_format_type, 3, 0);
|
|
+ printf_format_type, 3, 0, 0);
|
|
record_function_format (get_identifier ("vscanf"), NULL_TREE,
|
|
- scanf_format_type, 1, 0);
|
|
+ scanf_format_type, 1, 0, 0);
|
|
record_function_format (get_identifier ("vfscanf"), NULL_TREE,
|
|
- scanf_format_type, 2, 0);
|
|
+ scanf_format_type, 2, 0, 0);
|
|
record_function_format (get_identifier ("vsscanf"), NULL_TREE,
|
|
- scanf_format_type, 2, 0);
|
|
+ scanf_format_type, 2, 0, 0);
|
|
}
|
|
|
|
if (flag_hosted && flag_noniso_default_format_attributes)
|
|
@@ -1895,12 +1919,13 @@
|
|
|
|
static void
|
|
record_function_format (name, assembler_name, format_type,
|
|
- format_num, first_arg_num)
|
|
+ format_num, first_arg_num, null_format_ok)
|
|
tree name;
|
|
tree assembler_name;
|
|
enum format_type format_type;
|
|
int format_num;
|
|
int first_arg_num;
|
|
+ int null_format_ok;
|
|
{
|
|
function_format_info *info;
|
|
|
|
@@ -1924,6 +1949,7 @@
|
|
info->format_type = format_type;
|
|
info->format_num = format_num;
|
|
info->first_arg_num = first_arg_num;
|
|
+ info->null_format_ok = null_format_ok;
|
|
}
|
|
|
|
/* Record information for the names of function that modify the format
|
|
@@ -2415,7 +2441,7 @@
|
|
specially if info == NULL and add a res->number_null entry for
|
|
that case, or maybe add a function pointer to be called at
|
|
the end instead of hardcoding check_format_info_main. */
|
|
- status_warning (status, "null format string");
|
|
+ if (!info->null_format_ok) status_warning (status, "null format string");
|
|
|
|
/* Skip to first argument to check, so we can see if this format
|
|
has any arguments (it shouldn't). */
|
|
@@ -2611,6 +2637,54 @@
|
|
main_arg_num = opnum + info->first_arg_num - 1;
|
|
}
|
|
}
|
|
+ if (*format_chars == 'b')
|
|
+ {
|
|
+ /* There should be an int arg to control the string arg. */
|
|
+ if (params == 0)
|
|
+ {
|
|
+ status_warning (status, "too few arguments for format");
|
|
+ return;
|
|
+ }
|
|
+ if (info->first_arg_num != 0)
|
|
+ {
|
|
+ cur_param = TREE_VALUE (params);
|
|
+ params = TREE_CHAIN (params);
|
|
+ ++arg_num;
|
|
+ if ((TYPE_MAIN_VARIANT (TREE_TYPE (cur_param))
|
|
+ != integer_type_node)
|
|
+ &&
|
|
+ (TYPE_MAIN_VARIANT (TREE_TYPE (cur_param))
|
|
+ != unsigned_type_node))
|
|
+ {
|
|
+ status_warning (status, "bitmap is not type int (arg %d)", arg_num);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ if (*format_chars == 'D')
|
|
+ {
|
|
+ /* There should be an unsigned char * arg before the string arg. */
|
|
+ if (params == 0)
|
|
+ {
|
|
+ status_warning (status, "too few arguments for format");
|
|
+ return;
|
|
+ }
|
|
+ if (info->first_arg_num != 0)
|
|
+ {
|
|
+ tree cur_type;
|
|
+ cur_param = TREE_VALUE (params);
|
|
+ params = TREE_CHAIN (params);
|
|
+ ++arg_num;
|
|
+ cur_type = TREE_TYPE (cur_param);
|
|
+ if (TREE_CODE (cur_type) != POINTER_TYPE
|
|
+ || TYPE_MAIN_VARIANT (TREE_TYPE (cur_type))
|
|
+ != unsigned_char_type_node)
|
|
+ {
|
|
+ status_warning (status,
|
|
+ "ethernet address is not type unsigned char * (arg %d)",
|
|
+ arg_num);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
|
|
/* Read any format flags, but do not yet validate them beyond removing
|
|
duplicates, since in general validation depends on the rest of
|
|
@@ -2984,7 +3058,7 @@
|
|
else if (strchr (fci->flags2, '2') != 0)
|
|
y2k_level = 2;
|
|
if (y2k_level == 3)
|
|
- status_warning (status, "`%%%c' yields only last 2 digits of year in some locales",
|
|
+ status_warning (status, "`%%%c' yields only last 2 digits of year in some locales on non-BSD systems",
|
|
format_char);
|
|
else if (y2k_level == 2)
|
|
status_warning (status, "`%%%c' yields only last 2 digits of year", format_char);
|