[PATCH 6/6] scan-skel.l: change fail_for_invalid_at prototype

[Theophile Ranquet]

It now has the same as at_ptr, so factor further.

* src/scan-skel.l (fail_for_invalid_at): Treat like at_directive functions.
---
 src/scan-skel.l | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 840ba30..8658164 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -48,7 +48,7 @@ static void at_complain (int argc, char *argv[], char**, 
int*);
 static void at_output (int argc, char *argv[], char **name, int *lineno);
 static void fail_for_at_directive_too_many_args (char const 
*at_directive_name);
 static void fail_for_at_directive_too_few_args (char const *at_directive_name);
-static void fail_for_invalid_at (char const *at);
+static void fail_for_invalid_at (int, char *argv[], char**, int*);
 %}
 
 %x SC_AT_DIRECTIVE_ARGS
@@ -81,12 +81,12 @@ static void fail_for_invalid_at (char const *at);
 @basename"("    at_init (&argc, argv, &at_ptr, &at_basename);
 @complain"("    at_init (&argc, argv, &at_ptr, &at_complain);
 @output"("      at_init (&argc, argv, &at_ptr, &at_output);
address@hidden"("     at_init (&argc, argv, &at_ptr, NULL);
address@hidden"("     at_init (&argc, argv, &at_ptr, &fail_for_invalid_at);
 
   /* This pattern must not match more than the previous @ patterns. */
address@hidden@{}`(\n]* fail_for_invalid_at (yytext);
-\n         out_lineno++; ECHO;
address@hidden    ECHO;
address@hidden@{}`(\n]*    fail_for_invalid_at (0, &yytext, NULL, NULL);
+\n              out_lineno++; ECHO;
address@hidden         ECHO;
 
 <INITIAL><<EOF>> {
   if (outname)
@@ -118,10 +118,7 @@ static void fail_for_invalid_at (char const *at);
       BEGIN SC_AT_DIRECTIVE_SKIP_WS;
     else
       {
-        if (at_ptr == NULL)
-          fail_for_invalid_at (argv[0]);
-        else
-          at_ptr (argc, argv, &outname, &out_lineno);
+        at_ptr (argc, argv, &outname, &out_lineno);
 
         obstack_free (&obstack_for_string, argv[0]);
         argc = 0;
@@ -129,7 +126,7 @@ static void fail_for_invalid_at (char const *at);
       }
   }
 
-  @.?  fail_for_invalid_at (yytext);
+  @.?  fail_for_invalid_at (0, &yytext, NULL, NULL);
 }
 
 <SC_AT_DIRECTIVE_SKIP_WS>
@@ -262,7 +259,7 @@ fail_for_at_directive_too_many_args (char const 
*at_directive_name)
 }
 
 static void
-fail_for_invalid_at (char const *at)
+fail_for_invalid_at (int unused1, char *argv[], char **unused2, int *unused3)
 {
-  complain (NULL, fatal, "invalid @ in skeleton: %s", at);
+  complain (NULL, fatal, "invalid @ in skeleton: %s", argv[0]);
 }
-- 
1.7.11.4