Imported Upstream version 2.5.0

[debian/amanda] / recover-src / uscan.c

diff --git a/recover-src/uscan.c b/recover-src/uscan.c
index 40e1075dbd9e33f59a0d5165f668e7da3572abed..efabc189a241e6fd3292332d1e7f19cc6611b112 100644 (file)
--- a/recover-src/uscan.c
+++ b/recover-src/uscan.c
@@ -1,4 +1,4 @@
-/* A lexical scanner generated by flex */
+/* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
  * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
@@ -134,6 +134,15 @@ extern FILE *yyin, *yyout;
 
 #define unput(c) yyunput( c, yytext_ptr )
 
+/* Some routines like yy_flex_realloc() are emitted as static but are
+   not called by all lexers. This generates warnings in some compilers,
+   notably GCC. Arrange to suppress these. */
+#ifdef __GNUC__
+#define YY_MAY_BE_UNUSED __attribute__((unused))
+#else
+#define YY_MAY_BE_UNUSED
+#endif
+
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
@@ -240,7 +249,7 @@ YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
 YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
 static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
 static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
@@ -461,7 +470,7 @@ char *yytext;
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: uscan.l,v 1.14.2.3.4.1.2.2.2.1 2004/02/11 13:03:38 martinea Exp $
+ * $Id: uscan.l,v 1.22 2004/02/11 13:03:29 martinea Exp $
  *
  * lexer for amrecover interactive language
  */
@@ -481,7 +490,7 @@ static int  ll_parse_date P((int type, char *text));
 
 #line 48 "uscan.l"
 static char *string_buf = NULL;
-#line 485 "uscan.c"
+#line 494 "uscan.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -639,7 +648,7 @@ YY_DECL
     /* literal keyword tokens */
 
 
-#line 643 "uscan.c"
+#line 652 "uscan.c"
 
        if ( yy_init )
                {
@@ -951,7 +960,7 @@ YY_RULE_SETUP
 #line 148 "uscan.l"
 ECHO;
        YY_BREAK
-#line 955 "uscan.c"
+#line 964 "uscan.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(quotedstring):
        yyterminate();
@@ -1884,7 +1893,7 @@ char *text;
        yyerror("invalid day");
     } else {
        yylval.strval = alloc(DATE_ALLOC_SIZE);
-       ap_snprintf(yylval.strval, DATE_ALLOC_SIZE, "%04d-%02d-%02d", y, m, d);
+       snprintf(yylval.strval, DATE_ALLOC_SIZE, "%04d-%02d-%02d", y, m, d);
        ret = DATE;
     }
     return ret;