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

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 70550d0eab7ec1359ab2001b214f3dfc046a3e68..1914004b41bbf3b25759b7ebbf1550b84a951459 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index eec9a53e20d2a446870f263356c2b1cd027c3900..0a7fef1d3ee4597cafde786af8c7644fbf66e1e2 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -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

diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index 81be935eac8f7ec98e36c1747327f8832854fa91..400eb666d51d5297fe5a6de20f8aeb1e2e42d678 100644 (file)
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -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;

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index c461c6dbb62a8f1cd224321c61dd597a924deeea..df4f65d2a52d288cd7e00dc34a103b81527de698 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -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

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 130ffa6704b1da765bb5205d9068dc968863969b..0f10208a54f132c949ad4744716d273c081c6aff 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -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)

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 1394f18b844f3a4083d2d9c00e6f07a23490ddf4..46883e22dc0387e038b2a6d215a705ca404d1e3b 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -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;
            }
 

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 92b430d33518fd2c3dc65e253de872cc7377e998..ac7a46e79df942ce20056e702de96c59e456e56c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index bf6f0eb56bea8a6aca0c8ddfa113377e420286e3..0ecd30b691b08badc06f109b63aff0acb318f313 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -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");

diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 0e5eb85b61d6b914ccf499e53ff646fe40edbcfd..0c74c87a04b11858e889e1f855c0d4c9e16a63de 100644 (file)
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -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,

diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index 5cc2002d024bfe63ee96920dae97f598b6a90f32..37811712b9ed5c393d10c54886302379f7b491c0 100644 (file)
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -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;
 }