diff options
Diffstat (limited to 'gcc/c-decl.c')
| -rw-r--r-- | gcc/c-decl.c | 334 |
1 files changed, 170 insertions, 164 deletions
diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 60b613f..7d986cd 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -521,7 +521,7 @@ c_finish_incomplete_decl (tree decl) && ! DECL_EXTERNAL (decl) && TYPE_DOMAIN (type) == 0) { - warning ("%Jarray '%D' assumed to have one element", decl, decl); + warning ("%Jarray %qD assumed to have one element", decl, decl); complete_array_type (type, NULL_TREE, 1); @@ -718,15 +718,15 @@ pop_scope (void) /* Warnings for unused labels, errors for undefined labels. */ if (TREE_USED (p) && !DECL_INITIAL (p)) { - error ("%Jlabel `%D' used but not defined", p, p); + error ("%Jlabel %qD used but not defined", p, p); DECL_INITIAL (p) = error_mark_node; } else if (!TREE_USED (p) && warn_unused_label) { if (DECL_INITIAL (p)) - warning ("%Jlabel `%D' defined but not used", p, p); + warning ("%Jlabel %qD defined but not used", p, p); else - warning ("%Jlabel `%D' declared but not defined", p, p); + warning ("%Jlabel %qD declared but not defined", p, p); } /* Labels go in BLOCK_VARS. */ TREE_CHAIN (p) = BLOCK_VARS (block); @@ -771,7 +771,7 @@ pop_scope (void) || (TREE_STATIC (p) && !TREE_PUBLIC (p) && !TREE_THIS_VOLATILE (p))) && scope != external_scope) - warning ("%Junused variable `%D'", p, p); + warning ("%Junused variable %qD", p, p); if (b->inner_comp) { @@ -1050,13 +1050,13 @@ validate_proto_after_old_defn (tree newdecl, tree newtype, tree oldtype) agree on the number of arguments. */ if (END_OF_ARGLIST (oldargtype)) { - error ("%Jprototype for '%D' declares more arguments " + error ("%Jprototype for %qD declares more arguments " "than previous old-style definition", newdecl, newdecl); return false; } else if (END_OF_ARGLIST (newargtype)) { - error ("%Jprototype for '%D' declares fewer arguments " + error ("%Jprototype for %qD declares fewer arguments " "than previous old-style definition", newdecl, newdecl); return false; } @@ -1065,7 +1065,7 @@ validate_proto_after_old_defn (tree newdecl, tree newtype, tree oldtype) for the arg. */ else if (! comptypes (oldargtype, newargtype)) { - error ("%Jprototype for '%D' declares arg %d with incompatible type", + error ("%Jprototype for %qD declares arg %d with incompatible type", newdecl, newdecl, i); return false; } @@ -1077,7 +1077,7 @@ validate_proto_after_old_defn (tree newdecl, tree newtype, tree oldtype) /* If we get here, no errors were found, but do issue a warning for this poor-style construct. */ - warning ("%Jprototype for '%D' follows non-prototype definition", + warning ("%Jprototype for %qD follows non-prototype definition", newdecl, newdecl); return true; #undef END_OF_ARGLIST @@ -1092,11 +1092,11 @@ locate_old_decl (tree decl, void (*diag)(const char *, ...)) if (TREE_CODE (decl) == FUNCTION_DECL && DECL_BUILT_IN (decl)) ; else if (DECL_INITIAL (decl)) - diag (N_("%Jprevious definition of '%D' was here"), decl, decl); + diag (N_("%Jprevious definition of %qD was here"), decl, decl); else if (C_DECL_IMPLICIT (decl)) - diag (N_("%Jprevious implicit declaration of '%D' was here"), decl, decl); + diag (N_("%Jprevious implicit declaration of %qD was here"), decl, decl); else - diag (N_("%Jprevious declaration of '%D' was here"), decl, decl); + diag (N_("%Jprevious declaration of %qD was here"), decl, decl); } /* Subroutine of duplicate_decls. Compare NEWDECL to OLDDECL. @@ -1132,15 +1132,15 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, && DECL_BUILT_IN (olddecl) && !C_DECL_DECLARED_BUILTIN (olddecl))) { - error ("%J'%D' redeclared as different kind of symbol", + error ("%J%qD redeclared as different kind of symbol", newdecl, newdecl); locate_old_decl (olddecl, error); } else if (TREE_PUBLIC (newdecl)) - warning ("%Jbuilt-in function '%D' declared as non-function", + warning ("%Jbuilt-in function %qD declared as non-function", newdecl, newdecl); else if (warn_shadow) - warning ("%Jdeclaration of '%D' shadows a built-in function", + warning ("%Jdeclaration of %qD shadows a built-in function", newdecl, newdecl); return false; } @@ -1161,7 +1161,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, /* If types don't match for a built-in, throw away the built-in. No point in calling locate_old_decl here, it won't print anything. */ - warning ("%Jconflicting types for built-in function '%D'", + warning ("%Jconflicting types for built-in function %qD", newdecl, newdecl); return false; } @@ -1185,7 +1185,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, && TYPE_MAIN_VARIANT (TREE_TYPE (newtype)) == integer_type_node && C_FUNCTION_IMPLICIT_INT (newdecl)) { - pedwarn ("%Jconflicting types for '%D'", newdecl, newdecl); + pedwarn ("%Jconflicting types for %qD", newdecl, newdecl); /* Make sure we keep void as the return type. */ TREE_TYPE (newdecl) = *newtypep = newtype = oldtype; C_FUNCTION_IMPLICIT_INT (newdecl) = 0; @@ -1194,9 +1194,9 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, else { if (TYPE_QUALS (newtype) != TYPE_QUALS (oldtype)) - error ("%J conflicting type qualifiers for '%D'", newdecl, newdecl); + error ("%J conflicting type qualifiers for %qD", newdecl, newdecl); else - error ("%Jconflicting types for '%D'", newdecl, newdecl); + error ("%Jconflicting types for %qD", newdecl, newdecl); diagnose_arglist_conflict (newdecl, olddecl, newtype, oldtype); locate_old_decl (olddecl, error); return false; @@ -1211,7 +1211,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, if (DECL_IN_SYSTEM_HEADER (newdecl) || DECL_IN_SYSTEM_HEADER (olddecl)) return true; /* Allow OLDDECL to continue in use. */ - error ("%Jredefinition of typedef '%D'", newdecl, newdecl); + error ("%Jredefinition of typedef %qD", newdecl, newdecl); locate_old_decl (olddecl, error); return false; } @@ -1235,7 +1235,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, && !TYPE_ARG_TYPES (TREE_TYPE (newdecl))))) { if (warn_shadow) - warning ("%Jdeclaration of '%D' shadows a built-in function", + warning ("%Jdeclaration of %qD shadows a built-in function", newdecl, newdecl); /* Discard the old built-in function. */ return false; @@ -1250,7 +1250,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, && DECL_EXTERNAL (newdecl) && same_translation_unit_p (olddecl, newdecl)))) { - error ("%Jredefinition of '%D'", newdecl, newdecl); + error ("%Jredefinition of %qD", newdecl, newdecl); locate_old_decl (olddecl, error); return false; } @@ -1285,7 +1285,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, && !(DECL_EXTERNAL (olddecl) && DECL_DECLARED_INLINE_P (olddecl))) { - error ("%Jstatic declaration of '%D' follows " + error ("%Jstatic declaration of %qD follows " "non-static declaration", newdecl, newdecl); locate_old_decl (olddecl, error); } @@ -1295,14 +1295,14 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, { if (DECL_CONTEXT (olddecl)) { - error ("%Jnon-static declaration of '%D' follows " + error ("%Jnon-static declaration of %qD follows " "static declaration", newdecl, newdecl); locate_old_decl (olddecl, error); return false; } else if (warn_traditional) { - warning ("%Jnon-static declaration of '%D' follows " + warning ("%Jnon-static declaration of %qD follows " "static declaration", newdecl, newdecl); warned = true; } @@ -1315,10 +1315,10 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, if (DECL_THREAD_LOCAL (newdecl) != DECL_THREAD_LOCAL (olddecl)) { if (DECL_THREAD_LOCAL (newdecl)) - error ("%Jthread-local declaration of '%D' follows " + error ("%Jthread-local declaration of %qD follows " "non-thread-local declaration", newdecl, newdecl); else - error ("%Jnon-thread-local declaration of '%D' follows " + error ("%Jnon-thread-local declaration of %qD follows " "thread-local declaration", newdecl, newdecl); locate_old_decl (olddecl, error); @@ -1328,7 +1328,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, /* Multiple initialized definitions are not allowed (6.9p3,5). */ if (DECL_INITIAL (newdecl) && DECL_INITIAL (olddecl)) { - error ("%Jredefinition of '%D'", newdecl, newdecl); + error ("%Jredefinition of %qD", newdecl, newdecl); locate_old_decl (olddecl, error); return false; } @@ -1355,7 +1355,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, } else if (warn_traditional) { - warning ("%Jnon-static declaration of '%D' follows " + warning ("%Jnon-static declaration of %qD follows " "static declaration", newdecl, newdecl); warned = true; } @@ -1363,10 +1363,10 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, else { if (TREE_PUBLIC (newdecl)) - error ("%Jnon-static declaration of '%D' follows " + error ("%Jnon-static declaration of %qD follows " "static declaration", newdecl, newdecl); else - error ("%Jstatic declaration of '%D' follows " + error ("%Jstatic declaration of %qD follows " "non-static declaration", newdecl, newdecl); locate_old_decl (olddecl, error); @@ -1384,13 +1384,13 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, } else if (DECL_EXTERNAL (olddecl)) { - error ("%Jdeclaration of '%D' with no linkage follows " + error ("%Jdeclaration of %qD with no linkage follows " "extern declaration", newdecl, newdecl); locate_old_decl (olddecl, error); } else { - error ("%Jredeclaration of '%D' with no linkage", + error ("%Jredeclaration of %qD with no linkage", newdecl, newdecl); locate_old_decl (olddecl, error); } @@ -1404,7 +1404,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, if (DECL_VISIBILITY_SPECIFIED (newdecl) && DECL_VISIBILITY_SPECIFIED (olddecl) && DECL_VISIBILITY (newdecl) != DECL_VISIBILITY (olddecl)) { - warning ("%Jredeclaration of '%D' with different visibility " + warning ("%Jredeclaration of %qD with different visibility " "(old visibility preserved)", newdecl, newdecl); warned = true; } @@ -1415,14 +1415,14 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, if (DECL_DECLARED_INLINE_P (newdecl) && lookup_attribute ("noinline", DECL_ATTRIBUTES (olddecl))) { - warning ("%Jinline declaration of '%D' follows " + warning ("%Jinline declaration of %qD follows " "declaration with attribute noinline", newdecl, newdecl); warned = true; } else if (DECL_DECLARED_INLINE_P (olddecl) && lookup_attribute ("noinline", DECL_ATTRIBUTES (newdecl))) { - warning ("%Jdeclaration of '%D' with attribute noinline follows " + warning ("%Jdeclaration of %qD with attribute noinline follows " "inline declaration ", newdecl, newdecl); warned = true; } @@ -1437,13 +1437,13 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, { if (TREE_USED (olddecl)) { - warning ("%J'%D' declared inline after being called", + warning ("%J%qD declared inline after being called", olddecl, olddecl); warned = true; } else if (DECL_INITIAL (olddecl)) { - warning ("%J'%D' declared inline after its definition", + warning ("%J%qD declared inline after its definition", olddecl, olddecl); warned = true; } @@ -1463,7 +1463,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, if (TREE_CODE (newdecl) == PARM_DECL && (!TREE_ASM_WRITTEN (olddecl) || TREE_ASM_WRITTEN (newdecl))) { - error ("%Jredefinition of parameter '%D'", newdecl, newdecl); + error ("%Jredefinition of parameter %qD", newdecl, newdecl); locate_old_decl (olddecl, error); return false; } @@ -1487,7 +1487,7 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl, && !(TREE_CODE (newdecl) == PARM_DECL && TREE_ASM_WRITTEN (olddecl) && !TREE_ASM_WRITTEN (newdecl))) { - warning ("%Jredundant redeclaration of '%D'", newdecl, newdecl); + warning ("%Jredundant redeclaration of %qD", newdecl, newdecl); warned = true; } @@ -1793,17 +1793,17 @@ warn_if_shadowing (tree new_decl) tree old_decl = b->decl; if (TREE_CODE (old_decl) == PARM_DECL) - warning ("%Jdeclaration of '%D' shadows a parameter", + warning ("%Jdeclaration of %qD shadows a parameter", new_decl, new_decl); else if (DECL_FILE_SCOPE_P (old_decl)) - warning ("%Jdeclaration of '%D' shadows a global declaration", + warning ("%Jdeclaration of %qD shadows a global declaration", new_decl, new_decl); else if (TREE_CODE (old_decl) == FUNCTION_DECL && DECL_BUILT_IN (old_decl)) - warning ("%Jdeclaration of '%D' shadows a built-in function", + warning ("%Jdeclaration of %qD shadows a built-in function", new_decl, new_decl); else - warning ("%Jdeclaration of '%D' shadows a previous local", + warning ("%Jdeclaration of %qD shadows a previous local", new_decl, new_decl); if (TREE_CODE (old_decl) != FUNCTION_DECL @@ -1962,7 +1962,7 @@ pushdecl (tree x) if (warn_nested_externs && scope != file_scope && !DECL_IN_SYSTEM_HEADER (x)) - warning ("nested extern declaration of '%D'", x); + warning ("nested extern declaration of %qD", x); while (b && !B_IN_EXTERNAL_SCOPE (b)) { @@ -2051,7 +2051,7 @@ pushdecl (tree x) && !TREE_PUBLIC (x) && !DECL_INITIAL (x)) { if (warn_nested_externs && !DECL_IN_SYSTEM_HEADER (x)) - warning ("nested static declaration of '%D'", x); + warning ("nested static declaration of %qD", x); while (b && !B_IN_FILE_SCOPE (b)) b = b->shadowed; @@ -2146,7 +2146,7 @@ implicit_decl_warning (tree id, tree olddecl) default: gcc_unreachable (); } - diag (N_("implicit declaration of function '%E'"), id); + diag (N_("implicit declaration of function %qE"), id); if (olddecl) locate_old_decl (olddecl, diag); } @@ -2261,12 +2261,12 @@ undeclared_variable (tree id) if (current_function_decl == 0) { - error ("'%E' undeclared here (not in a function)", id); + error ("%qE undeclared here (not in a function)", id); scope = current_scope; } else { - error ("'%E' undeclared (first use in this function)", id); + error ("%qE undeclared (first use in this function)", id); if (! already) { @@ -2309,7 +2309,7 @@ lookup_label (tree name) if (current_function_decl == 0) { - error ("label %s referenced outside of any function", + error ("label %qs referenced outside of any function", IDENTIFIER_POINTER (name)); return 0; } @@ -2352,7 +2352,7 @@ declare_label (tree name) at this scope */ if (b && B_IN_CURRENT_SCOPE (b)) { - error ("duplicate label declaration `%s'", IDENTIFIER_POINTER (name)); + error ("duplicate label declaration %qs", IDENTIFIER_POINTER (name)); locate_old_decl (b->decl, error); /* Just use the previous declaration. */ @@ -2387,7 +2387,7 @@ define_label (location_t location, tree name) || (DECL_CONTEXT (label) != current_function_decl && C_DECLARED_LABEL_FLAG (label)))) { - error ("%Hduplicate label `%D'", &location, label); + error ("%Hduplicate label %qD", &location, label); locate_old_decl (label, error); return 0; } @@ -2410,7 +2410,7 @@ define_label (location_t location, tree name) if (warn_traditional && !in_system_header && lookup_name (name)) warning ("%Htraditional C lacks a separate namespace for labels, " - "identifier `%s' conflicts", &location, + "identifier %qs conflicts", &location, IDENTIFIER_POINTER (name)); /* Mark label as having been defined. */ @@ -2475,7 +2475,7 @@ void pending_xref_error (void) { if (pending_invalid_xref != 0) - error ("%H`%s' defined as wrong kind of tag", + error ("%H%qs defined as wrong kind of tag", &pending_invalid_xref_location, IDENTIFIER_POINTER (pending_invalid_xref)); pending_invalid_xref = 0; @@ -2808,12 +2808,13 @@ build_array_declarator (tree expr, struct c_declspecs *quals, bool static_p, if (pedantic && !flag_isoc99) { if (static_p || quals != NULL) - pedwarn ("ISO C90 does not support `static' or type qualifiers in parameter array declarators"); + pedwarn ("ISO C90 does not support %<static%> or type " + "qualifiers in parameter array declarators"); if (vla_unspec_p) - pedwarn ("ISO C90 does not support `[*]' array declarators"); + pedwarn ("ISO C90 does not support %<[*]%> array declarators"); } if (vla_unspec_p) - warning ("GCC does not yet properly implement `[*]' array declarators"); + warning ("GCC does not yet properly implement %<[*]%> array declarators"); return declarator; } @@ -2888,7 +2889,7 @@ start_decl (struct c_declarator *declarator, struct c_declspecs *declspecs, if (warn_main > 0 && TREE_CODE (decl) != FUNCTION_DECL && MAIN_NAME_P (DECL_NAME (decl))) - warning ("%J'%D' is usually a function", decl, decl); + warning ("%J%qD is usually a function", decl, decl); if (initialized) /* Is it valid for this decl to have an initializer at all? @@ -2897,18 +2898,18 @@ start_decl (struct c_declarator *declarator, struct c_declspecs *declspecs, switch (TREE_CODE (decl)) { case TYPE_DECL: - error ("typedef '%D' is initialized (use __typeof__ instead)", decl); + error ("typedef %qD is initialized (use __typeof__ instead)", decl); initialized = 0; break; case FUNCTION_DECL: - error ("function '%D' is initialized like a variable", decl); + error ("function %qD is initialized like a variable", decl); initialized = 0; break; case PARM_DECL: /* DECL_INITIAL in a PARM_DECL is really DECL_ARG_TYPE. */ - error ("parameter '%D' is initialized", decl); + error ("parameter %qD is initialized", decl); initialized = 0; break; @@ -2933,12 +2934,12 @@ start_decl (struct c_declarator *declarator, struct c_declspecs *declspecs, } else if (TREE_CODE (TREE_TYPE (decl)) != ARRAY_TYPE) { - error ("variable '%D' has initializer but incomplete type", decl); + error ("variable %qD has initializer but incomplete type", decl); initialized = 0; } else if (!COMPLETE_TYPE_P (TREE_TYPE (TREE_TYPE (decl)))) { - error ("elements of array '%D' have incomplete type", decl); + error ("elements of array %qD have incomplete type", decl); initialized = 0; } } @@ -3005,7 +3006,7 @@ start_decl (struct c_declarator *declarator, struct c_declspecs *declspecs, && DECL_DECLARED_INLINE_P (decl) && DECL_UNINLINABLE (decl) && lookup_attribute ("noinline", DECL_ATTRIBUTES (decl))) - warning ("%Jinline function '%D' given attribute noinline", decl, decl); + warning ("%Jinline function %qD given attribute noinline", decl, decl); /* Add this decl to the current scope. TEM may equal DECL or it may be a previous decl of the same name. */ @@ -3069,12 +3070,12 @@ finish_decl (tree decl, tree init, tree asmspec_tree) type = TREE_TYPE (decl); if (failure == 1) - error ("%Jinitializer fails to determine size of '%D'", decl, decl); + error ("%Jinitializer fails to determine size of %qD", decl, decl); else if (failure == 2) { if (do_default) - error ("%Jarray size missing in '%D'", decl, decl); + error ("%Jarray size missing in %qD", decl, decl); /* If a `static' var's size isn't known, make it extern as well as static, so it does not get allocated. @@ -3090,7 +3091,7 @@ finish_decl (tree decl, tree init, tree asmspec_tree) warn only if the value is less than zero. */ else if (pedantic && TYPE_DOMAIN (type) != 0 && tree_int_cst_sgn (TYPE_MAX_VALUE (TYPE_DOMAIN (type))) < 0) - error ("%Jzero or negative size array '%D'", decl, decl); + error ("%Jzero or negative size array %qD", decl, decl); layout_decl (decl, 0); } @@ -3116,7 +3117,7 @@ finish_decl (tree decl, tree init, tree asmspec_tree) is an error. */ : !DECL_EXTERNAL (decl))) { - error ("%Jstorage size of '%D' isn't known", decl, decl); + error ("%Jstorage size of %qD isn%'t known", decl, decl); TREE_TYPE (decl) = error_mark_node; } @@ -3126,7 +3127,7 @@ finish_decl (tree decl, tree init, tree asmspec_tree) if (TREE_CODE (DECL_SIZE (decl)) == INTEGER_CST) constant_expression_warning (DECL_SIZE (decl)); else - error ("%Jstorage size of '%D' isn't constant", decl, decl); + error ("%Jstorage size of %qD isn%'t constant", decl, decl); } if (TREE_USED (type)) @@ -3182,7 +3183,7 @@ finish_decl (tree decl, tree init, tree asmspec_tree) && !C_DECL_REGISTER (decl) && !TREE_STATIC (decl)) warning ("%Jignoring asm-specifier for non-static local " - "variable '%D'", decl, decl); + "variable %qD", decl, decl); else if (C_DECL_REGISTER (decl)) change_decl_assembler_name (decl, get_identifier (asmspec)); else @@ -3533,7 +3534,7 @@ check_bitfield_type_and_width (tree *type, tree *width, const char *orig_name) field widths. */ if (TREE_CODE (*width) != INTEGER_CST) { - error ("bit-field `%s' width not an integer constant", name); + error ("bit-field %qs width not an integer constant", name); *width = integer_one_node; } else @@ -3541,12 +3542,12 @@ check_bitfield_type_and_width (tree *type, tree *width, const char *orig_name) constant_expression_warning (*width); if (tree_int_cst_sgn (*width) < 0) { - error ("negative width in bit-field `%s'", name); + error ("negative width in bit-field %qs", name); *width = integer_one_node; } else if (integer_zerop (*width) && orig_name) { - error ("zero width for bit-field `%s'", name); + error ("zero width for bit-field %qs", name); *width = integer_one_node; } } @@ -3556,7 +3557,7 @@ check_bitfield_type_and_width (tree *type, tree *width, const char *orig_name) && TREE_CODE (*type) != BOOLEAN_TYPE && TREE_CODE (*type) != ENUMERAL_TYPE) { - error ("bit-field `%s' has invalid type", name); + error ("bit-field %qs has invalid type", name); *type = unsigned_type_node; } @@ -3565,7 +3566,7 @@ check_bitfield_type_and_width (tree *type, tree *width, const char *orig_name) && type_mv != integer_type_node && type_mv != unsigned_type_node && type_mv != boolean_type_node) - pedwarn ("type of bit-field `%s' is a GCC extension", name); + pedwarn ("type of bit-field %qs is a GCC extension", name); if (type_mv == boolean_type_node) max_width = CHAR_TYPE_SIZE; @@ -3574,7 +3575,7 @@ check_bitfield_type_and_width (tree *type, tree *width, const char *orig_name) if (0 < compare_tree_int (*width, max_width)) { - error ("width of `%s' exceeds its type", name); + error ("width of %qs exceeds its type", name); w = max_width; *width = build_int_cst (NULL_TREE, w); } @@ -3587,7 +3588,7 @@ check_bitfield_type_and_width (tree *type, tree *width, const char *orig_name) if (!lt || w < min_precision (lt->enum_min, TYPE_UNSIGNED (*type)) || w < min_precision (lt->enum_max, TYPE_UNSIGNED (*type))) - warning ("`%s' is narrower than values of its type", name); + warning ("%qs is narrower than values of its type", name); } } @@ -3723,7 +3724,7 @@ grokdeclarator (const struct c_declarator *declarator, && funcdef_flag) warn_about_return_type = 1; else if (warn_implicit_int || flag_isoc99) - pedwarn_c99 ("type defaults to `int' in declaration of `%s'", + pedwarn_c99 ("type defaults to %<int%> in declaration of %qs", name); } @@ -3752,36 +3753,36 @@ grokdeclarator (const struct c_declarator *declarator, if ((specbits & 1 << (int) RID_LONG) && (specbits & 1 << (int) RID_SHORT)) - error ("both long and short specified for `%s'", name); + error ("both long and short specified for %qs", name); else if (((specbits & 1 << (int) RID_LONG) || (specbits & 1 << (int) RID_SHORT)) && declspecs->explicit_char_p) - error ("long or short specified with char for `%s'", name); + error ("long or short specified with char for %qs", name); else if (((specbits & 1 << (int) RID_LONG) || (specbits & 1 << (int) RID_SHORT)) && TREE_CODE (type) == REAL_TYPE) { static int already = 0; - error ("long or short specified with floating type for `%s'", name); + error ("long or short specified with floating type for %qs", name); if (! already && ! pedantic) { - error ("the only valid combination is `long double'"); + error ("the only valid combination is %<long double%>"); already = 1; } } else if ((specbits & 1 << (int) RID_SIGNED) && (specbits & 1 << (int) RID_UNSIGNED)) - error ("both signed and unsigned specified for `%s'", name); + error ("both signed and unsigned specified for %qs", name); else if (TREE_CODE (type) != INTEGER_TYPE) - error ("long, short, signed or unsigned invalid for `%s'", name); + error ("long, short, signed or unsigned invalid for %qs", name); else { ok = 1; if (!declspecs->explicit_int_p && !defaulted_int && !declspecs->explicit_char_p) { - error ("long, short, signed or unsigned used invalidly for `%s'", + error ("long, short, signed or unsigned used invalidly for %qs", name); ok = 0; } @@ -3799,7 +3800,7 @@ grokdeclarator (const struct c_declarator *declarator, if ((specbits & (1 << (int) RID_COMPLEX)) && TREE_CODE (type) != INTEGER_TYPE && TREE_CODE (type) != REAL_TYPE) { - error ("complex invalid for `%s'", name); + error ("complex invalid for %qs", name); specbits &= ~(1 << (int) RID_COMPLEX); } @@ -3853,7 +3854,8 @@ grokdeclarator (const struct c_declarator *declarator, | (1 << (int) RID_UNSIGNED)))) { if (pedantic) - pedwarn ("ISO C does not support plain `complex' meaning `double complex'"); + pedwarn ("ISO C does not support plain %<complex%> meaning " + "%<double complex%>"); type = complex_double_type_node; } else if (type == integer_type_node) @@ -3900,11 +3902,11 @@ grokdeclarator (const struct c_declarator *declarator, if (pedantic && !flag_isoc99) { if (constp > 1) - pedwarn ("duplicate `const'"); + pedwarn ("duplicate %<const%>"); if (restrictp > 1) - pedwarn ("duplicate `restrict'"); + pedwarn ("duplicate %<restrict%>"); if (volatilep > 1) - pedwarn ("duplicate `volatile'"); + pedwarn ("duplicate %<volatile%>"); } if (! flag_gen_aux_info && (TYPE_QUALS (type))) type = TYPE_MAIN_VARIANT (type); @@ -3972,14 +3974,14 @@ grokdeclarator (const struct c_declarator *declarator, else if (current_scope == file_scope) { if (storage_class == csc_auto) - error ("file-scope declaration of `%s' specifies `auto'", name); + error ("file-scope declaration of %qs specifies %<auto%>", name); if (pedantic && storage_class == csc_register) pedwarn ("file-scope declaration of %qs specifies %<register%>", name); } else { if (storage_class == csc_extern && funcdef_flag) - error ("nested function `%s' declared `extern'", name); + error ("nested function %qs declared %<extern%>", name); else if (threadp && storage_class == csc_none) { error ("function-scope %qs implicitly auto and declared " @@ -4065,13 +4067,13 @@ grokdeclarator (const struct c_declarator *declarator, if (VOID_TYPE_P (type)) { - error ("declaration of `%s' as array of voids", name); + error ("declaration of %qs as array of voids", name); type = error_mark_node; } if (TREE_CODE (type) == FUNCTION_TYPE) { - error ("declaration of `%s' as array of functions", name); + error ("declaration of %qs as array of functions", name); type = error_mark_node; } @@ -4096,19 +4098,19 @@ grokdeclarator (const struct c_declarator *declarator, if (! INTEGRAL_TYPE_P (TREE_TYPE (size))) { - error ("size of array `%s' has non-integer type", name); + error ("size of array %qs has non-integer type", name); size = integer_one_node; } if (pedantic && integer_zerop (size)) - pedwarn ("ISO C forbids zero-size array `%s'", name); + pedwarn ("ISO C forbids zero-size array %qs", name); if (TREE_CODE (size) == INTEGER_CST) { constant_expression_warning (size); if (tree_int_cst_sgn (size) < 0) { - error ("size of array `%s' is negative", name); + error ("size of array %qs is negative", name); size = integer_one_node; } } @@ -4122,10 +4124,11 @@ grokdeclarator (const struct c_declarator *declarator, if (!flag_isoc99 && pedantic) { if (TREE_CONSTANT (size)) - pedwarn ("ISO C90 forbids array `%s' whose size can't be evaluated", + pedwarn ("ISO C90 forbids array %qs whose size " + "can%'t be evaluated", name); else - pedwarn ("ISO C90 forbids variable-size array `%s'", + pedwarn ("ISO C90 forbids variable-size array %qs", name); } } @@ -4158,7 +4161,7 @@ grokdeclarator (const struct c_declarator *declarator, complication. */ if (TREE_OVERFLOW (itype)) { - error ("size of array `%s' is too large", name); + error ("size of array %qs is too large", name); type = error_mark_node; continue; } @@ -4241,12 +4244,12 @@ grokdeclarator (const struct c_declarator *declarator, /* Warn about some types functions can't return. */ if (TREE_CODE (type) == FUNCTION_TYPE) { - error ("`%s' declared as function returning a function", name); + error ("%qs declared as function returning a function", name); type = integer_type_node; } if (TREE_CODE (type) == ARRAY_TYPE) { - error ("`%s' declared as function returning an array", name); + error ("%qs declared as function returning an array", name); type = integer_type_node; } @@ -4342,7 +4345,7 @@ grokdeclarator (const struct c_declarator *declarator, && COMPLETE_TYPE_P (type) && TREE_OVERFLOW (TYPE_SIZE (type))) { - error ("size of array `%s' is too large", name); + error ("size of array %qs is too large", name); /* If we proceed with the array type as it is, we'll eventually crash in tree_low_cst(). */ type = error_mark_node; @@ -4412,7 +4415,7 @@ grokdeclarator (const struct c_declarator *declarator, && !(storage_class == csc_static || storage_class == csc_register))))) { - error ("variable or field `%s' declared void", name); + error ("variable or field %qs declared void", name); type = integer_type_node; } @@ -4499,13 +4502,13 @@ grokdeclarator (const struct c_declarator *declarator, if (TREE_CODE (type) == FUNCTION_TYPE) { - error ("field `%s' declared as a function", name); + error ("field %qs declared as a function", name); type = build_pointer_type (type); } else if (TREE_CODE (type) != ERROR_MARK && !COMPLETE_OR_UNBOUND_ARRAY_TYPE_P (type)) { - error ("field `%s' has incomplete type", name); + error ("field %qs has incomplete type", name); type = error_mark_node; } /* Move type qualifiers down to element of an array. */ @@ -4522,7 +4525,7 @@ grokdeclarator (const struct c_declarator *declarator, else if (TREE_CODE (type) == FUNCTION_TYPE) { if (storage_class == csc_register || threadp) - error ("invalid storage class for function `%s'", name); + error ("invalid storage class for function %qs", name); else if (current_scope != file_scope) { /* Function declaration not at file scope. Storage @@ -4533,10 +4536,10 @@ grokdeclarator (const struct c_declarator *declarator, if (storage_class == csc_auto) { if (pedantic) - pedwarn ("invalid storage class for function `%s'", name); + pedwarn ("invalid storage class for function %qs", name); } if (storage_class == csc_static) - error ("invalid storage class for function `%s'", name); + error ("invalid storage class for function %qs", name); } decl = build_decl (FUNCTION_DECL, declarator->u.id, type); @@ -4551,7 +4554,7 @@ grokdeclarator (const struct c_declarator *declarator, that the function does not return. */ if ((type_quals & TYPE_QUAL_VOLATILE) && !VOID_TYPE_P (TREE_TYPE (TREE_TYPE (decl)))) - warning ("`noreturn' function returns non-void value"); + warning ("%<noreturn%> function returns non-void value"); /* Every function declaration is an external reference (DECL_EXTERNAL) except for those which are not at file @@ -4579,7 +4582,7 @@ grokdeclarator (const struct c_declarator *declarator, if (MAIN_NAME_P (declarator->u.id)) { if (declspecs->inline_p) - warning ("cannot inline function `main'"); + warning ("cannot inline function %<main%>"); } else if (declspecs->inline_p) { @@ -4636,8 +4639,8 @@ grokdeclarator (const struct c_declarator *declarator, && global_decl != visible_decl && TREE_CODE (global_decl) == VAR_DECL && !TREE_PUBLIC (global_decl)) - error ("variable previously declared 'static' redeclared " - "'extern'"); + error ("variable previously declared %<static%> redeclared " + "%<extern%>"); } decl = build_decl (VAR_DECL, declarator->u.id, type); @@ -4645,7 +4648,7 @@ grokdeclarator (const struct c_declarator *declarator, C_DECL_VARIABLE_SIZE (decl) = 1; if (declspecs->inline_p) - pedwarn ("%Jvariable '%D' declared `inline'", decl, decl); + pedwarn ("%Jvariable %qD declared %<inline%>", decl, decl); /* At file scope, an initialized extern declaration may follow a static declaration. In that case, DECL_EXTERNAL will be @@ -4738,7 +4741,7 @@ grokparms (struct c_arg_info *arg_info, bool funcdef_flag) if (warn_strict_prototypes && arg_types == 0 && !funcdef_flag && !in_system_header) - warning ("function declaration isn't a prototype"); + warning ("function declaration isn%'t a prototype"); if (arg_types == error_mark_node) return 0; /* don't set TYPE_ARG_TYPES in this case */ @@ -4775,7 +4778,7 @@ grokparms (struct c_arg_info *arg_info, bool funcdef_flag) if (funcdef_flag) { if (DECL_NAME (parm)) - error ("%Jparameter %u ('%D') has incomplete type", + error ("%Jparameter %u (%qD) has incomplete type", parm, parmno, parm); else error ("%Jparameter %u has incomplete type", @@ -4787,7 +4790,7 @@ grokparms (struct c_arg_info *arg_info, bool funcdef_flag) else { if (DECL_NAME (parm)) - warning ("%Jparameter %u ('%D') has incomplete type", + warning ("%Jparameter %u (%qD) has incomplete type", parm, parmno, parm); else warning ("%Jparameter %u has incomplete type", @@ -4847,11 +4850,11 @@ get_parm_info (bool ellipsis) if (TREE_THIS_VOLATILE (b->decl) || TREE_READONLY (b->decl) || C_DECL_REGISTER (b->decl)) - error ("'void' as only parameter may not be qualified"); + error ("%<void%> as only parameter may not be qualified"); /* There cannot be an ellipsis. */ if (ellipsis) - error ("'void' must be the only parameter"); + error ("%<void%> must be the only parameter"); arg_info->types = void_list_node; return arg_info; @@ -4879,14 +4882,14 @@ get_parm_info (bool ellipsis) /* Check for forward decls that never got their actual decl. */ if (TREE_ASM_WRITTEN (decl)) - error ("%Jparameter '%D' has just a forward declaration", + error ("%Jparameter %qD has just a forward declaration", decl, decl); /* Check for (..., void, ...) and issue an error. */ else if (VOID_TYPE_P (type) && !DECL_NAME (decl)) { if (!gave_void_only_once_err) { - error ("'void' must be the only parameter"); + error ("%<void%> must be the only parameter"); gave_void_only_once_err = true; } } @@ -4925,7 +4928,7 @@ get_parm_info (bool ellipsis) { if (b->id) /* The %s will be one of 'struct', 'union', or 'enum'. */ - warning ("'%s %E' declared inside parameter list", + warning ("%<%s %E%> declared inside parameter list", keyword, b->id); else /* The %s will be one of 'struct', 'union', or 'enum'. */ @@ -5048,9 +5051,9 @@ start_struct (enum tree_code code, tree name) if (TYPE_FIELDS (ref)) { if (code == UNION_TYPE) - error ("redefinition of `union %s'", IDENTIFIER_POINTER (name)); + error ("redefinition of %<union %s%>", IDENTIFIER_POINTER (name)); else - error ("redefinition of `struct %s'", IDENTIFIER_POINTER (name)); + error ("redefinition of %<struct %s%>", IDENTIFIER_POINTER (name)); } } else @@ -5166,7 +5169,7 @@ detect_field_duplicates (tree fieldlist) for (y = fieldlist; y != x; y = TREE_CHAIN (y)) if (DECL_NAME (y) == DECL_NAME (x)) { - error ("%Jduplicate member '%D'", x, x); + error ("%Jduplicate member %qD", x, x); DECL_NAME (x) = NULL_TREE; } } @@ -5182,7 +5185,7 @@ detect_field_duplicates (tree fieldlist) slot = htab_find_slot (htab, y, INSERT); if (*slot) { - error ("%Jduplicate member '%D'", x, x); + error ("%Jduplicate member %qD", x, x); DECL_NAME (x) = NULL_TREE; } *slot = y; @@ -5260,7 +5263,7 @@ finish_struct (tree t, tree fieldlist, tree attributes) /* Detect invalid nested redefinition. */ if (TREE_TYPE (x) == t) - error ("nested redefinition of `%s'", + error ("nested redefinition of %qs", IDENTIFIER_POINTER (TYPE_NAME (t))); if (DECL_INITIAL (x)) @@ -5470,7 +5473,7 @@ start_enum (tree name) if (TYPE_VALUES (enumtype) != 0) { /* This enum is a named one that has been declared already. */ - error ("redeclaration of `enum %s'", IDENTIFIER_POINTER (name)); + error ("redeclaration of %<enum %s%>", IDENTIFIER_POINTER (name)); /* Completely replace its old definition. The old enumerators remain defined, however. */ @@ -5649,7 +5652,7 @@ build_enumerator (tree name, tree value) value = 0; else if (TREE_CODE (value) != INTEGER_CST) { - error ("enumerator value for '%E' is not an integer constant", name); + error ("enumerator value for %qE is not an integer constant", name); value = 0; } else @@ -5671,7 +5674,7 @@ build_enumerator (tree name, tree value) if (pedantic && ! int_fits_type_p (value, integer_type_node)) { - pedwarn ("ISO C restricts enumerator values to range of `int'"); + pedwarn ("ISO C restricts enumerator values to range of %<int%>"); /* XXX This causes -pedantic to change the meaning of the program. Remove? -zw 2004-03-15 */ value = convert (integer_type_node, value); @@ -5741,7 +5744,7 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator, if (DECL_DECLARED_INLINE_P (decl1) && DECL_UNINLINABLE (decl1) && lookup_attribute ("noinline", DECL_ATTRIBUTES (decl1))) - warning ("%Jinline function '%D' given attribute noinline", decl1, decl1); + warning ("%Jinline function %qD given attribute noinline", decl1, decl1); announce_function (decl1); @@ -5755,7 +5758,7 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator, } if (warn_about_return_type) - pedwarn_c99 ("return type defaults to `int'"); + pedwarn_c99 ("return type defaults to %<int%>"); /* Make the init_value nonzero so pushdecl knows this is not tentative. error_mark_node is replaced below (in pop_scope) with the BLOCK. */ @@ -5780,32 +5783,32 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator, if (warn_strict_prototypes && TYPE_ARG_TYPES (TREE_TYPE (decl1)) == 0 && C_DECL_ISNT_PROTOTYPE (old_decl)) - warning ("function declaration isn't a prototype"); + warning ("function declaration isn%'t a prototype"); /* Optionally warn of any global def with no previous prototype. */ else if (warn_missing_prototypes && TREE_PUBLIC (decl1) && ! MAIN_NAME_P (DECL_NAME (decl1)) && C_DECL_ISNT_PROTOTYPE (old_decl)) - warning ("%Jno previous prototype for '%D'", decl1, decl1); + warning ("%Jno previous prototype for %qD", decl1, decl1); /* Optionally warn of any def with no previous prototype if the function has already been used. */ else if (warn_missing_prototypes && old_decl != 0 && TREE_USED (old_decl) && TYPE_ARG_TYPES (TREE_TYPE (old_decl)) == 0) - warning ("%J'%D' was used with no prototype before its definition", + warning ("%J%qD was used with no prototype before its definition", decl1, decl1); /* Optionally warn of any global def with no previous declaration. */ else if (warn_missing_declarations && TREE_PUBLIC (decl1) && old_decl == 0 && ! MAIN_NAME_P (DECL_NAME (decl1))) - warning ("%Jno previous declaration for '%D'", decl1, decl1); + warning ("%Jno previous declaration for %qD", decl1, decl1); /* Optionally warn of any def with no previous declaration if the function has already been used. */ else if (warn_missing_declarations && old_decl != 0 && TREE_USED (old_decl) && C_DECL_IMPLICIT (old_decl)) - warning ("%J`%D' was used with no declaration before its definition", + warning ("%J%qD was used with no declaration before its definition", decl1, decl1); /* This is a definition, not a reference. @@ -5838,7 +5841,7 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator, if (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (decl1))) != integer_type_node) - pedwarn ("%Jreturn type of '%D' is not `int'", decl1, decl1); + pedwarn ("%Jreturn type of %qD is not %<int%>", decl1, decl1); for (args = TYPE_ARG_TYPES (TREE_TYPE (decl1)); args; args = TREE_CHAIN (args)) @@ -5853,7 +5856,7 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator, { case 1: if (TYPE_MAIN_VARIANT (type) != integer_type_node) - pedwarn ("%Jfirst argument of '%D' should be `int'", + pedwarn ("%Jfirst argument of %qD should be %<int%>", decl1, decl1); break; @@ -5862,7 +5865,7 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator, || TREE_CODE (TREE_TYPE (type)) != POINTER_TYPE || (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (type))) != char_type_node)) - pedwarn ("%Jsecond argument of '%D' should be 'char **'", + pedwarn ("%Jsecond argument of %qD should be %<char **%>", decl1, decl1); break; @@ -5871,8 +5874,8 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator, || TREE_CODE (TREE_TYPE (type)) != POINTER_TYPE || (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (type))) != char_type_node)) - pedwarn ("%Jthird argument of '%D' should probably be " - "'char **'", decl1, decl1); + pedwarn ("%Jthird argument of %qD should probably be " + "%<char **%>", decl1, decl1); break; } } @@ -5881,10 +5884,10 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator, argument because it's only mentioned in an appendix of the standard. */ if (argct > 0 && (argct < 2 || argct > 3)) - pedwarn ("%J'%D' takes only zero or two arguments", decl1, decl1); + pedwarn ("%J%qD takes only zero or two arguments", decl1, decl1); if (! TREE_PUBLIC (decl1)) - pedwarn ("%J'%D' is normally a non-static function", decl1, decl1); + pedwarn ("%J%qD is normally a non-static function", decl1, decl1); } /* Record the decl so that the function name is defined. @@ -6014,12 +6017,12 @@ store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info) decl = b->decl; /* If we got something other than a PARM_DECL it is an error. */ if (TREE_CODE (decl) != PARM_DECL) - error ("%J'%D' declared as a non-parameter", decl, decl); + error ("%J%qD declared as a non-parameter", decl, decl); /* If the declaration is already marked, we have a duplicate name. Complain and ignore the duplicate. */ else if (DECL_WEAK (decl)) { - error ("%Jmultiple parameters named '%D'", decl, decl); + error ("%Jmultiple parameters named %qD", decl, decl); TREE_PURPOSE (parm) = 0; continue; } @@ -6027,7 +6030,7 @@ store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info) an int. */ else if (VOID_TYPE_P (TREE_TYPE (decl))) { - error ("%Jparameter '%D' declared with void type", decl, decl); + error ("%Jparameter %qD declared with void type", decl, decl); TREE_TYPE (decl) = integer_type_node; DECL_ARG_TYPE (decl) = integer_type_node; layout_decl (decl, 0); @@ -6042,9 +6045,9 @@ store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info) pushdecl (decl); if (flag_isoc99) - pedwarn ("%Jtype of '%D' defaults to 'int'", decl, decl); + pedwarn ("%Jtype of %qD defaults to %<int%>", decl, decl); else if (extra_warnings) - warning ("%Jtype of '%D' defaults to 'int'", decl, decl); + warning ("%Jtype of %qD defaults to %<int%>", decl, decl); } TREE_PURPOSE (parm) = decl; @@ -6062,13 +6065,13 @@ store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info) if (!COMPLETE_TYPE_P (TREE_TYPE (parm))) { - error ("%Jparameter '%D' has incomplete type", parm, parm); + error ("%Jparameter %qD has incomplete type", parm, parm); TREE_TYPE (parm) = error_mark_node; } if (! DECL_WEAK (parm)) { - error ("%Jdeclaration for parameter '%D' but no such parameter", + error ("%Jdeclaration for parameter %qD but no such parameter", parm, parm); /* Pretend the parameter was not missing. @@ -6118,7 +6121,7 @@ store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info) if (parm == 0 || type == 0 || TYPE_MAIN_VARIANT (TREE_VALUE (type)) == void_type_node) { - error ("number of arguments doesn't match prototype"); + error ("number of arguments doesn%'t match prototype"); error ("%Hprototype declaration", ¤t_function_prototype_locus); break; @@ -6147,15 +6150,15 @@ store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info) if (pedantic) { - pedwarn ("promoted argument '%D' " - "doesn't match prototype", parm); + pedwarn ("promoted argument %qD " + "doesn%'t match prototype", parm); pedwarn ("%Hprototype declaration", ¤t_function_prototype_locus); } } else { - error ("argument '%D' doesn't match prototype", parm); + error ("argument %qD doesn%'t match prototype", parm); error ("%Hprototype declaration", ¤t_function_prototype_locus); } @@ -6335,7 +6338,7 @@ finish_function (void) /* If warn_main is 1 (-Wmain) or 2 (-Wall), we have already warned. If warn_main is -1 (-Wno-main) we don't want to be warned. */ if (!warn_main) - pedwarn ("%Jreturn type of '%D' is not `int'", fndecl, fndecl); + pedwarn ("%Jreturn type of %qD is not %<int%>", fndecl, fndecl); } else { @@ -6449,7 +6452,7 @@ check_for_loop_decls (void) /* If we get here, declarations have been used in a for loop without the C99 for loop scope. This doesn't make much sense, so don't allow it. */ - error ("'for' loop initial declaration used outside C99 mode"); + error ("%<for%> loop initial declaration used outside C99 mode"); return; } /* C99 subclause 6.8.5 paragraph 3: @@ -6478,24 +6481,27 @@ check_for_loop_decls (void) { case VAR_DECL: if (TREE_STATIC (decl)) - error ("%Jdeclaration of static variable '%D' in 'for' loop " + error ("%Jdeclaration of static variable %qD in %<for%> loop " "initial declaration", decl, decl); else if (DECL_EXTERNAL (decl)) - error ("%Jdeclaration of 'extern' variable '%D' in 'for' loop " + error ("%Jdeclaration of %<extern%> variable %qD in %<for%> loop " "initial declaration", decl, decl); break; case RECORD_TYPE: - error ("'struct %E' declared in 'for' loop initial declaration", id); + error ("%<struct %E%> declared in %<for%> loop initial declaration", + id); break; case UNION_TYPE: - error ("'union %E' declared in 'for' loop initial declaration", id); + error ("%<union %E%> declared in %<for%> loop initial declaration", + id); break; case ENUMERAL_TYPE: - error ("'enum %E' declared in 'for' loop initial declaration", id); + error ("%<enum %E%> declared in %<for%> loop initial declaration", + id); break; default: - error ("%Jdeclaration of non-variable '%D' in 'for' loop " + error ("%Jdeclaration of non-variable %qD in %<for%> loop " "initial declaration", decl, decl); } } @@ -6968,7 +6974,7 @@ c_write_global_declarations_1 (tree globals) && !TREE_PUBLIC (decl) && C_DECL_USED (decl)) { - pedwarn ("%J%<%F%> used but never defined", decl, decl); + pedwarn ("%J%qF used but never defined", decl, decl); TREE_NO_WARNING (decl) = 1; } } |