Fix GNU coding style for G_.

2018-05-17  Martin Liska  <mliska@suse.cz>

	* gimple-ssa-sprintf.c (format_directive): Do not use
	space in between 'G_' and '('.
2018-05-17  Martin Liska  <mliska@suse.cz>

	* c-warn.c (overflow_warning): Do not use
	space in between 'G_' and '('.
2018-05-17  Martin Liska  <mliska@suse.cz>

	* gcc.dg/plugin/ggcplug.c (plugin_init): Do not use
	space in between 'G_' and '('.

From-SVN: r260314

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aaa4093..657faa8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-17  Martin Liska  <mliska@suse.cz>
+
+       * gimple-ssa-sprintf.c (format_directive): Do not use
+       space in between 'G_' and '('.
+
 2018-05-17  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/85323

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 27bdd2d..0930511 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-17  Martin Liska  <mliska@suse.cz>
+
+       * c-warn.c (overflow_warning): Do not use
+       space in between 'G_' and '('.
+
 2018-05-09  Jason Merrill  <jason@redhat.com>
 
        * c-common.c (valid_array_size_p): Add complain parameter.

diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c
index d0d9c78..2614eb5 100644 (file)
--- a/gcc/c-family/c-warn.c
+++ b/gcc/c-family/c-warn.c
@@ -98,10 +98,10 @@ overflow_warning (location_t loc, tree value, tree expr)
 
     case REAL_CST:
       warnfmt = (expr
-                ? G_ ("floating point overflow in expression %qE "
-                      "of type %qT results in %qE")
-                : G_ ("floating point overflow in expression of type %qT "
-                      "results in %qE"));
+                ? G_("floating point overflow in expression %qE "
+                     "of type %qT results in %qE")
+                : G_("floating point overflow in expression of type %qT "
+                     "results in %qE"));
       break;
 
     case FIXED_CST:

diff --git a/gcc/gimple-ssa-sprintf.c b/gcc/gimple-ssa-sprintf.c
index 4ec5860..ec5e704 100644 (file)
--- a/gcc/gimple-ssa-sprintf.c
+++ b/gcc/gimple-ssa-sprintf.c
@@ -2933,12 +2933,12 @@ format_directive (const sprintf_dom_walker::call_info &info,
       else
        warned = fmtwarn (dirloc, argloc, NULL, info.warnopt (),
                          fmtres.range.min > target_int_max ()
-                         ? G_ ("%<%.*s%> directive output between %wu and "
-                               "%wu bytes causes result to exceed "
-                               "%<INT_MAX%>")
-                         : G_ ("%<%.*s%> directive output between %wu and "
-                               "%wu bytes may cause result to exceed "
-                               "%<INT_MAX%>"), dirlen,
+                         ? G_("%<%.*s%> directive output between %wu and "
+                              "%wu bytes causes result to exceed "
+                              "%<INT_MAX%>")
+                         : G_("%<%.*s%> directive output between %wu and "
+                              "%wu bytes may cause result to exceed "
+                              "%<INT_MAX%>"), dirlen,
                          target_to_host (hostdir, sizeof hostdir, dir.beg),
                          fmtres.range.min, fmtres.range.max);
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1e5eb1b..f02fa93 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-17  Martin Liska  <mliska@suse.cz>
+
+       * gcc.dg/plugin/ggcplug.c (plugin_init): Do not use
+       space in between 'G_' and '('.
+
 2018-05-17  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/85323

diff --git a/gcc/testsuite/gcc.dg/plugin/ggcplug.c b/gcc/testsuite/gcc.dg/plugin/ggcplug.c
index c4bc334..c186d11 100644 (file)
--- a/gcc/testsuite/gcc.dg/plugin/ggcplug.c
+++ b/gcc/testsuite/gcc.dg/plugin/ggcplug.c
@@ -64,8 +64,8 @@ plugin_init (struct plugin_name_args *plugin_info,
       if (!strcmp (argv[i].key, "count-ggc-start"))
        {
          if (argv[i].value)
-           warning (0, G_ ("option '-fplugin-arg-%s-count-ggc-start=%s'"
-                           " ignored (superfluous '=%s')"),
+           warning (0, G_("option '-fplugin-arg-%s-count-ggc-start=%s'"
+                          " ignored (superfluous '=%s')"),
                     plugin_name, argv[i].value, argv[i].value);
          else
            register_callback ("ggcplug",
@@ -76,8 +76,8 @@ plugin_init (struct plugin_name_args *plugin_info,
       else if (!strcmp (argv[i].key, "count-ggc-end"))
        {
          if (argv[i].value)
-           warning (0, G_ ("option '-fplugin-arg-%s-count-ggc-end=%s'"
-                           " ignored (superfluous '=%s')"),
+           warning (0, G_("option '-fplugin-arg-%s-count-ggc-end=%s'"
+                          " ignored (superfluous '=%s')"),
                     plugin_name, argv[i].value, argv[i].value);
          else
            register_callback ("ggcplug",
@@ -88,8 +88,8 @@ plugin_init (struct plugin_name_args *plugin_info,
       else if (!strcmp (argv[i].key, "count-ggc-mark"))
        {
          if (argv[i].value)
-           warning (0, G_ ("option '-fplugin-arg-%s-count-ggc-mark=%s'"
-                           " ignored (superfluous '=%s')"),
+           warning (0, G_("option '-fplugin-arg-%s-count-ggc-mark=%s'"
+                          " ignored (superfluous '=%s')"),
                     plugin_name, argv[i].value, argv[i].value);
          else
            register_callback ("ggcplug",
@@ -100,8 +100,8 @@ plugin_init (struct plugin_name_args *plugin_info,
       else if (!strcmp (argv[i].key, "test-extra-root"))
        {
          if (argv[i].value)
-           warning (0, G_ ("option '-fplugin-arg-%s-test-extra-root=%s'"
-                           " ignored (superfluous '=%s')"),
+           warning (0, G_("option '-fplugin-arg-%s-test-extra-root=%s'"
+                          " ignored (superfluous '=%s')"),
                     plugin_name, argv[i].value, argv[i].value);
          else
            register_callback ("ggcplug",