scan-skel.l: shift complain_args arguments

Because argv[0] is never used, shift it out from the argument list.

* src/complain.c (complain_args): Here.
* src/scan-skel.l (at_complain): Adjust argv and argc.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>

diff --git a/src/complain.c b/src/complain.c
index 985ef404e79a2e42f0595edf1695e668b6f7aad5..0fa812abe1ff492a6f868e35e399dc84953d82fd 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -162,21 +162,21 @@ complain_args (location const *loc, warnings w, unsigned *indent,
 {
   switch (argc)
   {
 {
   switch (argc)
   {

+  case 1:
+    complain_indent (loc, w, indent, "%s", _(argv[0]));
+    break;

   case 2:
   case 2:

-    complain_indent (loc, w, indent, "%s", _(argv[1]));
+    complain_indent (loc, w, indent, _(argv[0]), argv[1]);

     break;
   case 3:
     break;
   case 3:

-    complain_indent (loc, w, indent, _(argv[1]), argv[2]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2]);

     break;
   case 4:
     break;
   case 4:

-    complain_indent (loc, w, indent, _(argv[1]), argv[2], argv[3]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3]);

     break;
   case 5:
     break;
   case 5:

-    complain_indent (loc, w, indent, _(argv[1]), argv[2], argv[3], argv[4]);
-    break;
-  case 6:
-    complain_indent (loc, w, indent, _(argv[1]), argv[2], argv[3], argv[4],
-                     argv[5]);
+    complain_indent (loc, w, indent, _(argv[0]), argv[1], argv[2], argv[3],
+                     argv[4]);

     break;
   default:
     complain (loc, fatal, "too many arguments for complains");
     break;
   default:
     complain (loc, fatal, "too many arguments for complains");

diff --git a/src/scan-skel.l b/src/scan-skel.l
index c5b46eb4a94595262470dc349d0ed3a90132a62d..c1e7b65987409eac8532b345b19c6248b00405c8 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -226,7 +226,7 @@ at_complain (int argc, char *argv[], char **out_namep, int *out_linenop)
     indent += SUB_INDENT;
   else
     indent = 0;
     indent += SUB_INDENT;
   else
     indent = 0;

-  complain_args (locp, w, &indent, argc - 3, argv + 3);
+  complain_args (locp, w, &indent, argc - 4, argv + 4);

   if (w & silent)
     indent -= SUB_INDENT;
 }
   if (w & silent)
     indent -= SUB_INDENT;
 }