diff --git a/doc/Changelog b/doc/Changelog index c47d19c60..63ff65aa4 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +20 October 2016: Wouter + - suppress compile warning in lex files. + 19 October 2016: Wouter - Fix #1130: whitespace in example.conf.in more consistent. diff --git a/util/configlexer.c b/util/configlexer.c index 4968e6d0b..9a4f31737 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -9,8 +9,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 0 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -163,7 +163,12 @@ typedef unsigned int flex_uint32_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -extern int yyleng; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t yyleng; extern FILE *yyin, *yyout; @@ -172,6 +177,7 @@ extern FILE *yyin, *yyout; #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -189,11 +195,6 @@ extern FILE *yyin, *yyout; #define unput(c) yyunput( c, (yytext_ptr) ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -211,7 +212,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -281,8 +282,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -310,7 +311,7 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); void *yyalloc (yy_size_t ); void *yyrealloc (void *,yy_size_t ); @@ -353,11 +354,17 @@ extern int yylineno; int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext static yy_state_type yy_get_previous_state (void ); static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); static int yy_get_next_buffer (void ); +#if defined(__GNUC__) && __GNUC__ >= 3 +__attribute__((__noreturn__)) +#endif static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the @@ -594,7 +601,7 @@ static yyconst flex_int16_t yy_accept[1904] = 160, 164, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static yyconst YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, @@ -626,7 +633,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[40] = +static yyconst YY_CHAR yy_meta[40] = { 0, 1, 2, 3, 4, 5, 1, 6, 1, 1, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 1, @@ -634,7 +641,7 @@ static yyconst flex_int32_t yy_meta[40] = 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[1918] = +static yyconst flex_uint16_t yy_base[1918] = { 0, 0, 0, 37, 40, 44, 51, 63, 75, 56, 68, 87, 108, 2353, 2241, 50, 3751, 3751, 3751, 129, 94, @@ -1064,7 +1071,7 @@ static yyconst flex_int16_t yy_def[1918] = 1903, 1903, 1903, 1903, 1903, 1903, 1903 } ; -static yyconst flex_int16_t yy_nxt[3791] = +static yyconst flex_uint16_t yy_nxt[3791] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 18, 20, 21, 14, 22, 23, 24, 25, 14, @@ -1932,7 +1939,9 @@ char *yytext; */ /* because flex keeps having sign-unsigned compare problems that are unfixed*/ +#if defined(__clang__)||(defined(__GNUC__)&&((__GNUC__ >4)||(defined(__GNUC_MINOR__)&&(__GNUC__ ==4)&&(__GNUC_MINOR__ >=2)))) #pragma GCC diagnostic ignored "-Wsign-compare" +#endif #include #include @@ -2102,7 +2111,7 @@ static void config_end_include(void) #endif #define YY_NO_INPUT 1 -#line 185 "./util/configlexer.lex" +#line 187 "./util/configlexer.lex" #ifndef YY_NO_UNPUT #define YY_NO_UNPUT 1 #endif @@ -2110,7 +2119,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 2112 "" +#line 2121 "" #define INITIAL 0 #define quotedstring 1 @@ -2148,19 +2157,19 @@ void yyset_extra (YY_EXTRA_TYPE user_defined ); FILE *yyget_in (void ); -void yyset_in (FILE * in_str ); +void yyset_in (FILE * _in_str ); FILE *yyget_out (void ); -void yyset_out (FILE * out_str ); +void yyset_out (FILE * _out_str ); -int yyget_leng (void ); +yy_size_t yyget_leng (void ); char *yyget_text (void ); int yyget_lineno (void ); -void yyset_lineno (int line_number ); +void yyset_lineno (int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -2174,6 +2183,10 @@ extern int yywrap (void ); #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ); #endif @@ -2286,7 +2299,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -2296,14 +2309,10 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; -#line 205 "./util/configlexer.lex" - -#line 2304 "" - if ( !(yy_init) ) { (yy_init) = 1; @@ -2330,7 +2339,12 @@ YY_DECL yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { +#line 207 "./util/configlexer.lex" + +#line 2344 "" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { (yy_more_len) = 0; if ( (yy_more_flag) ) @@ -2352,7 +2366,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2393,883 +2407,883 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 206 "./util/configlexer.lex" +#line 208 "./util/configlexer.lex" { LEXOUT(("SP ")); /* ignore */ } YY_BREAK case 2: YY_RULE_SETUP -#line 208 "./util/configlexer.lex" +#line 210 "./util/configlexer.lex" { /* note that flex makes the longest match and '.' is any but not nl */ LEXOUT(("comment(%s) ", yytext)); /* ignore */ } YY_BREAK case 3: YY_RULE_SETUP -#line 211 "./util/configlexer.lex" +#line 213 "./util/configlexer.lex" { YDVAR(0, VAR_SERVER) } YY_BREAK case 4: YY_RULE_SETUP -#line 212 "./util/configlexer.lex" +#line 214 "./util/configlexer.lex" { YDVAR(1, VAR_QNAME_MINIMISATION) } YY_BREAK case 5: YY_RULE_SETUP -#line 213 "./util/configlexer.lex" +#line 215 "./util/configlexer.lex" { YDVAR(1, VAR_QNAME_MINIMISATION_STRICT) } YY_BREAK case 6: YY_RULE_SETUP -#line 214 "./util/configlexer.lex" +#line 216 "./util/configlexer.lex" { YDVAR(1, VAR_NUM_THREADS) } YY_BREAK case 7: YY_RULE_SETUP -#line 215 "./util/configlexer.lex" +#line 217 "./util/configlexer.lex" { YDVAR(1, VAR_VERBOSITY) } YY_BREAK case 8: YY_RULE_SETUP -#line 216 "./util/configlexer.lex" +#line 218 "./util/configlexer.lex" { YDVAR(1, VAR_PORT) } YY_BREAK case 9: YY_RULE_SETUP -#line 217 "./util/configlexer.lex" +#line 219 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_RANGE) } YY_BREAK case 10: YY_RULE_SETUP -#line 218 "./util/configlexer.lex" +#line 220 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_PORT_PERMIT) } YY_BREAK case 11: YY_RULE_SETUP -#line 219 "./util/configlexer.lex" +#line 221 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_PORT_AVOID) } YY_BREAK case 12: YY_RULE_SETUP -#line 220 "./util/configlexer.lex" +#line 222 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_NUM_TCP) } YY_BREAK case 13: YY_RULE_SETUP -#line 221 "./util/configlexer.lex" +#line 223 "./util/configlexer.lex" { YDVAR(1, VAR_INCOMING_NUM_TCP) } YY_BREAK case 14: YY_RULE_SETUP -#line 222 "./util/configlexer.lex" +#line 224 "./util/configlexer.lex" { YDVAR(1, VAR_DO_IP4) } YY_BREAK case 15: YY_RULE_SETUP -#line 223 "./util/configlexer.lex" +#line 225 "./util/configlexer.lex" { YDVAR(1, VAR_DO_IP6) } YY_BREAK case 16: YY_RULE_SETUP -#line 224 "./util/configlexer.lex" +#line 226 "./util/configlexer.lex" { YDVAR(1, VAR_PREFER_IP6) } YY_BREAK case 17: YY_RULE_SETUP -#line 225 "./util/configlexer.lex" +#line 227 "./util/configlexer.lex" { YDVAR(1, VAR_DO_UDP) } YY_BREAK case 18: YY_RULE_SETUP -#line 226 "./util/configlexer.lex" +#line 228 "./util/configlexer.lex" { YDVAR(1, VAR_DO_TCP) } YY_BREAK case 19: YY_RULE_SETUP -#line 227 "./util/configlexer.lex" +#line 229 "./util/configlexer.lex" { YDVAR(1, VAR_TCP_UPSTREAM) } YY_BREAK case 20: YY_RULE_SETUP -#line 228 "./util/configlexer.lex" +#line 230 "./util/configlexer.lex" { YDVAR(1, VAR_TCP_MSS) } YY_BREAK case 21: YY_RULE_SETUP -#line 229 "./util/configlexer.lex" +#line 231 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_TCP_MSS) } YY_BREAK case 22: YY_RULE_SETUP -#line 230 "./util/configlexer.lex" +#line 232 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_UPSTREAM) } YY_BREAK case 23: YY_RULE_SETUP -#line 231 "./util/configlexer.lex" +#line 233 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_SERVICE_KEY) } YY_BREAK case 24: YY_RULE_SETUP -#line 232 "./util/configlexer.lex" +#line 234 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_SERVICE_PEM) } YY_BREAK case 25: YY_RULE_SETUP -#line 233 "./util/configlexer.lex" +#line 235 "./util/configlexer.lex" { YDVAR(1, VAR_SSL_PORT) } YY_BREAK case 26: YY_RULE_SETUP -#line 234 "./util/configlexer.lex" +#line 236 "./util/configlexer.lex" { YDVAR(1, VAR_DO_DAEMONIZE) } YY_BREAK case 27: YY_RULE_SETUP -#line 235 "./util/configlexer.lex" +#line 237 "./util/configlexer.lex" { YDVAR(1, VAR_INTERFACE) } YY_BREAK case 28: YY_RULE_SETUP -#line 236 "./util/configlexer.lex" +#line 238 "./util/configlexer.lex" { YDVAR(1, VAR_INTERFACE) } YY_BREAK case 29: YY_RULE_SETUP -#line 237 "./util/configlexer.lex" +#line 239 "./util/configlexer.lex" { YDVAR(1, VAR_OUTGOING_INTERFACE) } YY_BREAK case 30: YY_RULE_SETUP -#line 238 "./util/configlexer.lex" +#line 240 "./util/configlexer.lex" { YDVAR(1, VAR_INTERFACE_AUTOMATIC) } YY_BREAK case 31: YY_RULE_SETUP -#line 239 "./util/configlexer.lex" +#line 241 "./util/configlexer.lex" { YDVAR(1, VAR_SO_RCVBUF) } YY_BREAK case 32: YY_RULE_SETUP -#line 240 "./util/configlexer.lex" +#line 242 "./util/configlexer.lex" { YDVAR(1, VAR_SO_SNDBUF) } YY_BREAK case 33: YY_RULE_SETUP -#line 241 "./util/configlexer.lex" +#line 243 "./util/configlexer.lex" { YDVAR(1, VAR_SO_REUSEPORT) } YY_BREAK case 34: YY_RULE_SETUP -#line 242 "./util/configlexer.lex" +#line 244 "./util/configlexer.lex" { YDVAR(1, VAR_IP_TRANSPARENT) } YY_BREAK case 35: YY_RULE_SETUP -#line 243 "./util/configlexer.lex" +#line 245 "./util/configlexer.lex" { YDVAR(1, VAR_IP_FREEBIND) } YY_BREAK case 36: YY_RULE_SETUP -#line 244 "./util/configlexer.lex" +#line 246 "./util/configlexer.lex" { YDVAR(1, VAR_CHROOT) } YY_BREAK case 37: YY_RULE_SETUP -#line 245 "./util/configlexer.lex" +#line 247 "./util/configlexer.lex" { YDVAR(1, VAR_USERNAME) } YY_BREAK case 38: YY_RULE_SETUP -#line 246 "./util/configlexer.lex" +#line 248 "./util/configlexer.lex" { YDVAR(1, VAR_DIRECTORY) } YY_BREAK case 39: YY_RULE_SETUP -#line 247 "./util/configlexer.lex" +#line 249 "./util/configlexer.lex" { YDVAR(1, VAR_LOGFILE) } YY_BREAK case 40: YY_RULE_SETUP -#line 248 "./util/configlexer.lex" +#line 250 "./util/configlexer.lex" { YDVAR(1, VAR_PIDFILE) } YY_BREAK case 41: YY_RULE_SETUP -#line 249 "./util/configlexer.lex" +#line 251 "./util/configlexer.lex" { YDVAR(1, VAR_ROOT_HINTS) } YY_BREAK case 42: YY_RULE_SETUP -#line 250 "./util/configlexer.lex" +#line 252 "./util/configlexer.lex" { YDVAR(1, VAR_EDNS_BUFFER_SIZE) } YY_BREAK case 43: YY_RULE_SETUP -#line 251 "./util/configlexer.lex" +#line 253 "./util/configlexer.lex" { YDVAR(1, VAR_MSG_BUFFER_SIZE) } YY_BREAK case 44: YY_RULE_SETUP -#line 252 "./util/configlexer.lex" +#line 254 "./util/configlexer.lex" { YDVAR(1, VAR_MSG_CACHE_SIZE) } YY_BREAK case 45: YY_RULE_SETUP -#line 253 "./util/configlexer.lex" +#line 255 "./util/configlexer.lex" { YDVAR(1, VAR_MSG_CACHE_SLABS) } YY_BREAK case 46: YY_RULE_SETUP -#line 254 "./util/configlexer.lex" +#line 256 "./util/configlexer.lex" { YDVAR(1, VAR_RRSET_CACHE_SIZE) } YY_BREAK case 47: YY_RULE_SETUP -#line 255 "./util/configlexer.lex" +#line 257 "./util/configlexer.lex" { YDVAR(1, VAR_RRSET_CACHE_SLABS) } YY_BREAK case 48: YY_RULE_SETUP -#line 256 "./util/configlexer.lex" +#line 258 "./util/configlexer.lex" { YDVAR(1, VAR_CACHE_MAX_TTL) } YY_BREAK case 49: YY_RULE_SETUP -#line 257 "./util/configlexer.lex" +#line 259 "./util/configlexer.lex" { YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) } YY_BREAK case 50: YY_RULE_SETUP -#line 258 "./util/configlexer.lex" +#line 260 "./util/configlexer.lex" { YDVAR(1, VAR_CACHE_MIN_TTL) } YY_BREAK case 51: YY_RULE_SETUP -#line 259 "./util/configlexer.lex" +#line 261 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_HOST_TTL) } YY_BREAK case 52: YY_RULE_SETUP -#line 260 "./util/configlexer.lex" +#line 262 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_LAME_TTL) } YY_BREAK case 53: YY_RULE_SETUP -#line 261 "./util/configlexer.lex" +#line 263 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_CACHE_SLABS) } YY_BREAK case 54: YY_RULE_SETUP -#line 262 "./util/configlexer.lex" +#line 264 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } YY_BREAK case 55: YY_RULE_SETUP -#line 263 "./util/configlexer.lex" +#line 265 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } YY_BREAK case 56: YY_RULE_SETUP -#line 264 "./util/configlexer.lex" +#line 266 "./util/configlexer.lex" { YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } YY_BREAK case 57: YY_RULE_SETUP -#line 265 "./util/configlexer.lex" +#line 267 "./util/configlexer.lex" { YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } YY_BREAK case 58: YY_RULE_SETUP -#line 266 "./util/configlexer.lex" +#line 268 "./util/configlexer.lex" { YDVAR(1, VAR_JOSTLE_TIMEOUT) } YY_BREAK case 59: YY_RULE_SETUP -#line 267 "./util/configlexer.lex" +#line 269 "./util/configlexer.lex" { YDVAR(1, VAR_DELAY_CLOSE) } YY_BREAK case 60: YY_RULE_SETUP -#line 268 "./util/configlexer.lex" +#line 270 "./util/configlexer.lex" { YDVAR(1, VAR_TARGET_FETCH_POLICY) } YY_BREAK case 61: YY_RULE_SETUP -#line 269 "./util/configlexer.lex" +#line 271 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } YY_BREAK case 62: YY_RULE_SETUP -#line 270 "./util/configlexer.lex" +#line 272 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } YY_BREAK case 63: YY_RULE_SETUP -#line 271 "./util/configlexer.lex" +#line 273 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_GLUE) } YY_BREAK case 64: YY_RULE_SETUP -#line 272 "./util/configlexer.lex" +#line 274 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 65: YY_RULE_SETUP -#line 273 "./util/configlexer.lex" +#line 275 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } YY_BREAK case 66: YY_RULE_SETUP -#line 274 "./util/configlexer.lex" +#line 276 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } YY_BREAK case 67: YY_RULE_SETUP -#line 275 "./util/configlexer.lex" +#line 277 "./util/configlexer.lex" { YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } YY_BREAK case 68: YY_RULE_SETUP -#line 276 "./util/configlexer.lex" +#line 278 "./util/configlexer.lex" { YDVAR(1, VAR_USE_CAPS_FOR_ID) } YY_BREAK case 69: YY_RULE_SETUP -#line 277 "./util/configlexer.lex" +#line 279 "./util/configlexer.lex" { YDVAR(1, VAR_CAPS_WHITELIST) } YY_BREAK case 70: YY_RULE_SETUP -#line 278 "./util/configlexer.lex" +#line 280 "./util/configlexer.lex" { YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } YY_BREAK case 71: YY_RULE_SETUP -#line 279 "./util/configlexer.lex" +#line 281 "./util/configlexer.lex" { YDVAR(1, VAR_PRIVATE_ADDRESS) } YY_BREAK case 72: YY_RULE_SETUP -#line 280 "./util/configlexer.lex" +#line 282 "./util/configlexer.lex" { YDVAR(1, VAR_PRIVATE_DOMAIN) } YY_BREAK case 73: YY_RULE_SETUP -#line 281 "./util/configlexer.lex" +#line 283 "./util/configlexer.lex" { YDVAR(1, VAR_PREFETCH_KEY) } YY_BREAK case 74: YY_RULE_SETUP -#line 282 "./util/configlexer.lex" +#line 284 "./util/configlexer.lex" { YDVAR(1, VAR_PREFETCH) } YY_BREAK case 75: YY_RULE_SETUP -#line 283 "./util/configlexer.lex" +#line 285 "./util/configlexer.lex" { YDVAR(0, VAR_STUB_ZONE) } YY_BREAK case 76: YY_RULE_SETUP -#line 284 "./util/configlexer.lex" +#line 286 "./util/configlexer.lex" { YDVAR(1, VAR_NAME) } YY_BREAK case 77: YY_RULE_SETUP -#line 285 "./util/configlexer.lex" +#line 287 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_ADDR) } YY_BREAK case 78: YY_RULE_SETUP -#line 286 "./util/configlexer.lex" +#line 288 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_HOST) } YY_BREAK case 79: YY_RULE_SETUP -#line 287 "./util/configlexer.lex" +#line 289 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_PRIME) } YY_BREAK case 80: YY_RULE_SETUP -#line 288 "./util/configlexer.lex" +#line 290 "./util/configlexer.lex" { YDVAR(1, VAR_STUB_FIRST) } YY_BREAK case 81: YY_RULE_SETUP -#line 289 "./util/configlexer.lex" +#line 291 "./util/configlexer.lex" { YDVAR(0, VAR_FORWARD_ZONE) } YY_BREAK case 82: YY_RULE_SETUP -#line 290 "./util/configlexer.lex" +#line 292 "./util/configlexer.lex" { YDVAR(1, VAR_FORWARD_ADDR) } YY_BREAK case 83: YY_RULE_SETUP -#line 291 "./util/configlexer.lex" +#line 293 "./util/configlexer.lex" { YDVAR(1, VAR_FORWARD_HOST) } YY_BREAK case 84: YY_RULE_SETUP -#line 292 "./util/configlexer.lex" +#line 294 "./util/configlexer.lex" { YDVAR(1, VAR_FORWARD_FIRST) } YY_BREAK case 85: YY_RULE_SETUP -#line 293 "./util/configlexer.lex" +#line 295 "./util/configlexer.lex" { YDVAR(0, VAR_VIEW) } YY_BREAK case 86: YY_RULE_SETUP -#line 294 "./util/configlexer.lex" +#line 296 "./util/configlexer.lex" { YDVAR(1, VAR_VIEW_FIRST) } YY_BREAK case 87: YY_RULE_SETUP -#line 295 "./util/configlexer.lex" +#line 297 "./util/configlexer.lex" { YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } YY_BREAK case 88: YY_RULE_SETUP -#line 296 "./util/configlexer.lex" +#line 298 "./util/configlexer.lex" { YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } YY_BREAK case 89: YY_RULE_SETUP -#line 297 "./util/configlexer.lex" +#line 299 "./util/configlexer.lex" { YDVAR(2, VAR_ACCESS_CONTROL) } YY_BREAK case 90: YY_RULE_SETUP -#line 298 "./util/configlexer.lex" +#line 300 "./util/configlexer.lex" { YDVAR(1, VAR_HIDE_IDENTITY) } YY_BREAK case 91: YY_RULE_SETUP -#line 299 "./util/configlexer.lex" +#line 301 "./util/configlexer.lex" { YDVAR(1, VAR_HIDE_VERSION) } YY_BREAK case 92: YY_RULE_SETUP -#line 300 "./util/configlexer.lex" +#line 302 "./util/configlexer.lex" { YDVAR(1, VAR_IDENTITY) } YY_BREAK case 93: YY_RULE_SETUP -#line 301 "./util/configlexer.lex" +#line 303 "./util/configlexer.lex" { YDVAR(1, VAR_VERSION) } YY_BREAK case 94: YY_RULE_SETUP -#line 302 "./util/configlexer.lex" +#line 304 "./util/configlexer.lex" { YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 95: YY_RULE_SETUP -#line 303 "./util/configlexer.lex" +#line 305 "./util/configlexer.lex" { YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 96: YY_RULE_SETUP -#line 304 "./util/configlexer.lex" +#line 306 "./util/configlexer.lex" { YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 97: YY_RULE_SETUP -#line 305 "./util/configlexer.lex" +#line 307 "./util/configlexer.lex" { YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 98: YY_RULE_SETUP -#line 306 "./util/configlexer.lex" +#line 308 "./util/configlexer.lex" { YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 99: YY_RULE_SETUP -#line 307 "./util/configlexer.lex" +#line 309 "./util/configlexer.lex" { YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 100: YY_RULE_SETUP -#line 308 "./util/configlexer.lex" +#line 310 "./util/configlexer.lex" { YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 101: YY_RULE_SETUP -#line 309 "./util/configlexer.lex" +#line 311 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 102: YY_RULE_SETUP -#line 310 "./util/configlexer.lex" +#line 312 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 103: YY_RULE_SETUP -#line 311 "./util/configlexer.lex" +#line 313 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 104: YY_RULE_SETUP -#line 312 "./util/configlexer.lex" +#line 314 "./util/configlexer.lex" { YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 105: YY_RULE_SETUP -#line 313 "./util/configlexer.lex" +#line 315 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 106: YY_RULE_SETUP -#line 314 "./util/configlexer.lex" +#line 316 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 107: YY_RULE_SETUP -#line 315 "./util/configlexer.lex" +#line 317 "./util/configlexer.lex" { YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 108: YY_RULE_SETUP -#line 316 "./util/configlexer.lex" +#line 318 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 109: YY_RULE_SETUP -#line 317 "./util/configlexer.lex" +#line 319 "./util/configlexer.lex" { YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 110: YY_RULE_SETUP -#line 318 "./util/configlexer.lex" +#line 320 "./util/configlexer.lex" { YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 111: YY_RULE_SETUP -#line 319 "./util/configlexer.lex" +#line 321 "./util/configlexer.lex" { YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 112: YY_RULE_SETUP -#line 320 "./util/configlexer.lex" +#line 322 "./util/configlexer.lex" { YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 113: YY_RULE_SETUP -#line 322 "./util/configlexer.lex" +#line 324 "./util/configlexer.lex" { YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 114: YY_RULE_SETUP -#line 323 "./util/configlexer.lex" +#line 325 "./util/configlexer.lex" { YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 115: YY_RULE_SETUP -#line 324 "./util/configlexer.lex" +#line 326 "./util/configlexer.lex" { YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 116: YY_RULE_SETUP -#line 325 "./util/configlexer.lex" +#line 327 "./util/configlexer.lex" { YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } YY_BREAK case 117: YY_RULE_SETUP -#line 326 "./util/configlexer.lex" +#line 328 "./util/configlexer.lex" { YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 118: YY_RULE_SETUP -#line 327 "./util/configlexer.lex" +#line 329 "./util/configlexer.lex" { YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 119: YY_RULE_SETUP -#line 328 "./util/configlexer.lex" +#line 330 "./util/configlexer.lex" { YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 120: YY_RULE_SETUP -#line 329 "./util/configlexer.lex" +#line 331 "./util/configlexer.lex" { YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 121: YY_RULE_SETUP -#line 330 "./util/configlexer.lex" +#line 332 "./util/configlexer.lex" { YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 122: YY_RULE_SETUP -#line 331 "./util/configlexer.lex" +#line 333 "./util/configlexer.lex" { YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 123: YY_RULE_SETUP -#line 332 "./util/configlexer.lex" +#line 334 "./util/configlexer.lex" { YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 124: YY_RULE_SETUP -#line 333 "./util/configlexer.lex" +#line 335 "./util/configlexer.lex" { YDVAR(1, VAR_INSECURE_LAN_ZONES) } YY_BREAK case 125: YY_RULE_SETUP -#line 334 "./util/configlexer.lex" +#line 336 "./util/configlexer.lex" { YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 126: YY_RULE_SETUP -#line 335 "./util/configlexer.lex" +#line 337 "./util/configlexer.lex" { YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 127: YY_RULE_SETUP -#line 336 "./util/configlexer.lex" +#line 338 "./util/configlexer.lex" { YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 128: YY_RULE_SETUP -#line 337 "./util/configlexer.lex" +#line 339 "./util/configlexer.lex" { YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 129: YY_RULE_SETUP -#line 338 "./util/configlexer.lex" +#line 340 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 130: YY_RULE_SETUP -#line 339 "./util/configlexer.lex" +#line 341 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 131: YY_RULE_SETUP -#line 340 "./util/configlexer.lex" +#line 342 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 132: YY_RULE_SETUP -#line 341 "./util/configlexer.lex" +#line 343 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 133: YY_RULE_SETUP -#line 342 "./util/configlexer.lex" +#line 344 "./util/configlexer.lex" { YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 134: YY_RULE_SETUP -#line 343 "./util/configlexer.lex" +#line 345 "./util/configlexer.lex" { YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 135: YY_RULE_SETUP -#line 344 "./util/configlexer.lex" +#line 346 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 136: YY_RULE_SETUP -#line 345 "./util/configlexer.lex" +#line 347 "./util/configlexer.lex" { YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 137: YY_RULE_SETUP -#line 346 "./util/configlexer.lex" +#line 348 "./util/configlexer.lex" { YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 138: YY_RULE_SETUP -#line 347 "./util/configlexer.lex" +#line 349 "./util/configlexer.lex" { YDVAR(0, VAR_PYTHON) } YY_BREAK case 139: YY_RULE_SETUP -#line 348 "./util/configlexer.lex" +#line 350 "./util/configlexer.lex" { YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 140: YY_RULE_SETUP -#line 349 "./util/configlexer.lex" +#line 351 "./util/configlexer.lex" { YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 141: YY_RULE_SETUP -#line 350 "./util/configlexer.lex" +#line 352 "./util/configlexer.lex" { YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 142: YY_RULE_SETUP -#line 351 "./util/configlexer.lex" +#line 353 "./util/configlexer.lex" { YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 143: YY_RULE_SETUP -#line 352 "./util/configlexer.lex" +#line 354 "./util/configlexer.lex" { YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 144: YY_RULE_SETUP -#line 353 "./util/configlexer.lex" +#line 355 "./util/configlexer.lex" { YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 145: YY_RULE_SETUP -#line 354 "./util/configlexer.lex" +#line 356 "./util/configlexer.lex" { YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 146: YY_RULE_SETUP -#line 355 "./util/configlexer.lex" +#line 357 "./util/configlexer.lex" { YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 147: YY_RULE_SETUP -#line 356 "./util/configlexer.lex" +#line 358 "./util/configlexer.lex" { YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 148: YY_RULE_SETUP -#line 357 "./util/configlexer.lex" +#line 359 "./util/configlexer.lex" { YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 149: YY_RULE_SETUP -#line 358 "./util/configlexer.lex" +#line 360 "./util/configlexer.lex" { YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 150: YY_RULE_SETUP -#line 359 "./util/configlexer.lex" +#line 361 "./util/configlexer.lex" { YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 151: YY_RULE_SETUP -#line 360 "./util/configlexer.lex" +#line 362 "./util/configlexer.lex" { YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 152: YY_RULE_SETUP -#line 361 "./util/configlexer.lex" +#line 363 "./util/configlexer.lex" { YDVAR(0, VAR_DNSTAP) } YY_BREAK case 153: YY_RULE_SETUP -#line 362 "./util/configlexer.lex" +#line 364 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 154: YY_RULE_SETUP -#line 363 "./util/configlexer.lex" +#line 365 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 155: YY_RULE_SETUP -#line 364 "./util/configlexer.lex" +#line 366 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 156: YY_RULE_SETUP -#line 365 "./util/configlexer.lex" +#line 367 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 157: YY_RULE_SETUP -#line 366 "./util/configlexer.lex" +#line 368 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 158: YY_RULE_SETUP -#line 367 "./util/configlexer.lex" +#line 369 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 159: YY_RULE_SETUP -#line 368 "./util/configlexer.lex" +#line 370 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 160: YY_RULE_SETUP -#line 370 "./util/configlexer.lex" +#line 372 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 161: YY_RULE_SETUP -#line 372 "./util/configlexer.lex" +#line 374 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 162: YY_RULE_SETUP -#line 374 "./util/configlexer.lex" +#line 376 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 163: YY_RULE_SETUP -#line 376 "./util/configlexer.lex" +#line 378 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 164: YY_RULE_SETUP -#line 378 "./util/configlexer.lex" +#line 380 "./util/configlexer.lex" { YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 165: YY_RULE_SETUP -#line 380 "./util/configlexer.lex" +#line 382 "./util/configlexer.lex" { YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 166: YY_RULE_SETUP -#line 381 "./util/configlexer.lex" +#line 383 "./util/configlexer.lex" { YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 167: YY_RULE_SETUP -#line 382 "./util/configlexer.lex" +#line 384 "./util/configlexer.lex" { YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 168: YY_RULE_SETUP -#line 383 "./util/configlexer.lex" +#line 385 "./util/configlexer.lex" { YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 169: YY_RULE_SETUP -#line 384 "./util/configlexer.lex" +#line 386 "./util/configlexer.lex" { YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 170: YY_RULE_SETUP -#line 385 "./util/configlexer.lex" +#line 387 "./util/configlexer.lex" { YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 171: YY_RULE_SETUP -#line 386 "./util/configlexer.lex" +#line 388 "./util/configlexer.lex" { YDVAR(1, VAR_RATELIMIT_FACTOR) } YY_BREAK case 172: /* rule 172 can match eol */ YY_RULE_SETUP -#line 387 "./util/configlexer.lex" +#line 389 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ case 173: YY_RULE_SETUP -#line 390 "./util/configlexer.lex" +#line 392 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 391 "./util/configlexer.lex" +#line 393 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3278,19 +3292,19 @@ case YY_STATE_EOF(quotedstring): YY_BREAK case 174: YY_RULE_SETUP -#line 396 "./util/configlexer.lex" +#line 398 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK case 175: /* rule 175 can match eol */ YY_RULE_SETUP -#line 397 "./util/configlexer.lex" +#line 399 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK case 176: YY_RULE_SETUP -#line 399 "./util/configlexer.lex" +#line 401 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3305,11 +3319,11 @@ YY_RULE_SETUP /* Single Quoted strings. Strip leading and ending quotes */ case 177: YY_RULE_SETUP -#line 411 "./util/configlexer.lex" +#line 413 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 412 "./util/configlexer.lex" +#line 414 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3318,19 +3332,19 @@ case YY_STATE_EOF(singlequotedstr): YY_BREAK case 178: YY_RULE_SETUP -#line 417 "./util/configlexer.lex" +#line 419 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK case 179: /* rule 179 can match eol */ YY_RULE_SETUP -#line 418 "./util/configlexer.lex" +#line 420 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK case 180: YY_RULE_SETUP -#line 420 "./util/configlexer.lex" +#line 422 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3345,12 +3359,12 @@ YY_RULE_SETUP /* include: directive */ case 181: YY_RULE_SETUP -#line 432 "./util/configlexer.lex" +#line 434 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 434 "./util/configlexer.lex" +#line 436 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); @@ -3358,23 +3372,23 @@ case YY_STATE_EOF(include): YY_BREAK case 182: YY_RULE_SETUP -#line 438 "./util/configlexer.lex" +#line 440 "./util/configlexer.lex" { LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 183: /* rule 183 can match eol */ YY_RULE_SETUP -#line 439 "./util/configlexer.lex" +#line 441 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 184: YY_RULE_SETUP -#line 440 "./util/configlexer.lex" +#line 442 "./util/configlexer.lex" { LEXOUT(("IQS ")); BEGIN(include_quoted); } YY_BREAK case 185: YY_RULE_SETUP -#line 441 "./util/configlexer.lex" +#line 443 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -3382,7 +3396,7 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 446 "./util/configlexer.lex" +#line 448 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); @@ -3390,19 +3404,19 @@ case YY_STATE_EOF(include_quoted): YY_BREAK case 186: YY_RULE_SETUP -#line 450 "./util/configlexer.lex" +#line 452 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK case 187: /* rule 187 can match eol */ YY_RULE_SETUP -#line 451 "./util/configlexer.lex" +#line 453 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK case 188: YY_RULE_SETUP -#line 453 "./util/configlexer.lex" +#line 455 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -3412,7 +3426,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 459 "./util/configlexer.lex" +#line 461 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -3426,31 +3440,31 @@ case YY_STATE_EOF(val): YY_BREAK case 189: YY_RULE_SETUP -#line 470 "./util/configlexer.lex" +#line 472 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK case 190: YY_RULE_SETUP -#line 474 "./util/configlexer.lex" +#line 476 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK case 191: YY_RULE_SETUP -#line 478 "./util/configlexer.lex" +#line 480 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK case 192: YY_RULE_SETUP -#line 482 "./util/configlexer.lex" +#line 484 "./util/configlexer.lex" ECHO; YY_BREAK -#line 3452 "" +#line 3466 "" case YY_END_OF_BUFFER: { @@ -3579,6 +3593,7 @@ ECHO; "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -3590,9 +3605,9 @@ ECHO; */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + yy_size_t number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -3621,7 +3636,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -3641,14 +3656,14 @@ static int yy_get_next_buffer (void) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -3679,7 +3694,7 @@ static int yy_get_next_buffer (void) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), (size_t) num_to_read ); + (yy_n_chars), num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -3724,14 +3739,14 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -3756,10 +3771,10 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -3774,9 +3789,13 @@ static int yy_get_next_buffer (void) yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 1903); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -3801,7 +3820,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -3926,7 +3945,7 @@ static void yy_load_buffer_state (void) if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = size; + b->yy_buf_size = (yy_size_t)size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. @@ -3961,10 +3980,6 @@ static void yy_load_buffer_state (void) yyfree((void *) b ); } -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -4077,7 +4092,7 @@ void yypop_buffer_state (void) */ static void yyensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -4085,7 +4100,7 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; // After all that talk, this was set to 1 anyways... (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); @@ -4102,7 +4117,7 @@ static void yyensure_buffer_stack (void) if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -4174,12 +4189,12 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - int i; + yy_size_t i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -4210,7 +4225,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) static void yy_fatal_error (yyconst char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -4261,7 +4276,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -int yyget_leng (void) +yy_size_t yyget_leng (void) { return yyleng; } @@ -4276,29 +4291,29 @@ char *yyget_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -4306,9 +4321,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -4368,7 +4383,8 @@ int yylex_destroy (void) #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -4377,7 +4393,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #ifdef YY_NEED_STRLEN static int yy_flex_strlen (yyconst char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -4387,11 +4403,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return (void *) malloc( size ); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -4404,12 +4421,12 @@ void *yyrealloc (void * ptr, yy_size_t size ) void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 482 "./util/configlexer.lex" +#line 484 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index bdc7f463d..ad5167a4b 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -9,7 +9,9 @@ */ /* because flex keeps having sign-unsigned compare problems that are unfixed*/ +#if defined(__clang__)||(defined(__GNUC__)&&((__GNUC__ >4)||(defined(__GNUC_MINOR__)&&(__GNUC__ ==4)&&(__GNUC_MINOR__ >=2)))) #pragma GCC diagnostic ignored "-Wsign-compare" +#endif #include #include