procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify uses of "%<%s%>" to "%qs" (PR translation/79848)

Browse source 
gcc/c-family/ChangeLog:
	PR translation/79848
	* c-format.c (check_format_string): Simplify uses of "%<%s%>" to
	"%qs".

gcc/c/ChangeLog:
	PR translation/79848
	* c-decl.c (declspecs_add_type): Simplify uses of "%<%s%>" to
	"%qs".
	* c-parser.c (c_parser_oacc_shape_clause): Likewise.

gcc/cp/ChangeLog:
	PR translation/79848
	* decl.c (grokfndecl): Simplify uses of "%<%s%>" to "%qs".

gcc/ChangeLog:
	PR translation/79848
	* ipa-devirt.c (warn_types_mismatch): Simplify uses of "%<%s%>" to
	"%qs".
	* ipa-pure-const.c (suggest_attribute): Likewise.  Convert _
	to G_ to avoid double translation.

From-SVN: r246068
This commit is contained in:
David Malcolm 2017-03-11 01:57:11 +00:00 • committed by David Malcolm
parent 90aaff2cde
commit 2f6f187a86
10 changed files with 45 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/ChangeLog
View file

@ -1,3 +1,11 @@
2017-03-10 David Malcolm <dmalcolm@redhat.com>
PR translation/79848
* ipa-devirt.c (warn_types_mismatch): Simplify uses of "%<%s%>" to
"%qs".
* ipa-pure-const.c (suggest_attribute): Likewise. Convert _
to G_ to avoid double translation.
2017-03-10 David Malcolm <dmalcolm@redhat.com>
PR translation/79923

6
gcc/c-family/ChangeLog
View file

@ -1,3 +1,9 @@
2017-03-10 David Malcolm <dmalcolm@redhat.com>
PR translation/79848
* c-format.c (check_format_string): Simplify uses of "%<%s%>" to
"%qs".
2017-03-10 David Malcolm <dmalcolm@redhat.com>
PR c/79921

6
gcc/c-family/c-format.c
View file

@ -207,7 +207,7 @@ check_format_string (tree fntype, unsigned HOST_WIDE_INT format_num,
{
/* We expected a char but found an extended string type. */
if (is_objc_sref)
error ("found a %<%s%> reference but the format argument should"
error ("found a %qs reference but the format argument should"
" be a string", format_name (gcc_objc_string_format_type));
else
error ("found a %qT but the format argument should be a string",
@ -220,7 +220,7 @@ check_format_string (tree fntype, unsigned HOST_WIDE_INT format_num,
/* We expect a string object type as the format arg. */
if (is_char_ref)
{
error ("format argument should be a %<%s%> reference but"
error ("format argument should be a %qs reference but"
" a string was found", format_name (expected_format_type));
*no_add_attrs = true;
return false;
@ -242,7 +242,7 @@ check_format_string (tree fntype, unsigned HOST_WIDE_INT format_num,
return true;
else
{
error ("format argument should be a %<%s%> reference",
error ("format argument should be a %qs reference",
format_name (expected_format_type));
*no_add_attrs = true;
return false;

7
gcc/c/ChangeLog
View file

@ -1,3 +1,10 @@
2017-03-10 David Malcolm <dmalcolm@redhat.com>
PR translation/79848
* c-decl.c (declspecs_add_type): Simplify uses of "%<%s%>" to
"%qs".
* c-parser.c (c_parser_oacc_shape_clause): Likewise.
2017-03-09 Marek Polacek <polacek@redhat.com>
PR sanitizer/79757

16
gcc/c/c-decl.c
View file

@ -10517,37 +10517,37 @@ declspecs_add_type (location_t loc, struct c_declspecs *specs,
str = "_Decimal128";
if (specs->long_long_p)
error_at (loc,
("both %<long long%> and %<%s%> in "
("both %<long long%> and %qs in "
"declaration specifiers"),
str);
if (specs->long_p)
error_at (loc,
("both %<long%> and %<%s%> in "
("both %<long%> and %qs in "
"declaration specifiers"),
str);
else if (specs->short_p)
error_at (loc,
("both %<short%> and %<%s%> in "
("both %<short%> and %qs in "
"declaration specifiers"),
str);
else if (specs->signed_p)
error_at (loc,
("both %<signed%> and %<%s%> in "
("both %<signed%> and %qs in "
"declaration specifiers"),
str);
else if (specs->unsigned_p)
error_at (loc,
("both %<unsigned%> and %<%s%> in "
("both %<unsigned%> and %qs in "
"declaration specifiers"),
str);
else if (specs->complex_p)
error_at (loc,
("both %<complex%> and %<%s%> in "
("both %<complex%> and %qs in "
"declaration specifiers"),
str);
else if (specs->saturating_p)
error_at (loc,
("both %<_Sat%> and %<%s%> in "
("both %<_Sat%> and %qs in "
"declaration specifiers"),
str);
else if (i == RID_DFLOAT32)
@ -10575,7 +10575,7 @@ declspecs_add_type (location_t loc, struct c_declspecs *specs,
str = "_Accum";
if (specs->complex_p)
error_at (loc,
("both %<complex%> and %<%s%> in "
("both %<complex%> and %qs in "
"declaration specifiers"),
str);
else if (i == RID_FRACT)

2
gcc/c/c-parser.c
View file

@ -11820,7 +11820,7 @@ c_parser_oacc_shape_clause (c_parser *parser, omp_clause_code kind,
if (c == boolean_true_node)
{
warning_at (loc, 0,
"%<%s%> value must be positive", str);
"%qs value must be positive", str);
expr = integer_one_node;
}

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2017-03-10 David Malcolm <dmalcolm@redhat.com>
PR translation/79848
* decl.c (grokfndecl): Simplify uses of "%<%s%>" to "%qs".
2017-03-10 Jason Merrill <jason@redhat.com>
PR c++/79960 - alias templates and partial ordering

6
gcc/cp/decl.c
View file

@ -8777,13 +8777,13 @@ grokfndecl (tree ctype,
if (long_long_unsigned_p)
{
if (cpp_interpret_int_suffix (parse_in, suffix, strlen (suffix)))
warning (0, "integer suffix %<%s%>"
warning (0, "integer suffix %qs"
" shadowed by implementation", suffix);
}
else if (long_double_p)
{
if (cpp_interpret_float_suffix (parse_in, suffix, strlen (suffix)))
warning (0, "floating point suffix %<%s%>"
warning (0, "floating point suffix %qs"
" shadowed by implementation", suffix);
}
}
@ -11839,7 +11839,7 @@ grokdeclarator (const cp_declarator *declarator,
headers because glibc uses them. */;
else if (name)
pedwarn (input_location, OPT_Wpedantic,
"ISO C++ forbids flexible array member %<%s%>", name);
"ISO C++ forbids flexible array member %qs", name);
else
pedwarn (input_location, OPT_Wpedantic,
"ISO C++ forbids flexible array members");

2
gcc/ipa-devirt.c
View file

@ -1139,7 +1139,7 @@ warn_types_mismatch (tree t1, tree t2, location_t loc1, location_t loc2)
if (name1 && name2 && strcmp (name1, name2))
{
inform (loc_t1,
"type name %<%s%> should match type name %<%s%>",
"type name %qs should match type name %qs",
name1, name2);
if (loc_t2_useful)
inform (loc_t2,

6
gcc/ipa-pure-const.c
View file

@ -184,9 +184,9 @@ suggest_attribute (int option, tree decl, bool known_finite,
warning_at (DECL_SOURCE_LOCATION (decl),
option,
known_finite
? _("function might be candidate for attribute %<%s%>")
: _("function might be candidate for attribute %<%s%>"
" if it is known to return normally"), attrib_name);
? G_("function might be candidate for attribute %qs")
: G_("function might be candidate for attribute %qs"
" if it is known to return normally"), attrib_name);
return warned_about;
}