From 4a4b2a5eafe89e87798d231522c756750d14ce60 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 8 Feb 2010 09:57:31 +0100 Subject: s4:heimdal: regerenate files Andrew using cp like in commit ca12e7bc8ff4a91f2044c0a60550fec902e97a78 is wrong as that removes #include "config.h" and breaks the build on AIX. metze --- source4/heimdal/lib/hx509/sel-gram.c | 62 ++++++++++++++++++------------------ source4/heimdal/lib/hx509/sel-gram.h | 4 +-- source4/heimdal/lib/hx509/sel-lex.c | 33 +++++++++++++------ 3 files changed, 57 insertions(+), 42 deletions(-) (limited to 'source4/heimdal/lib/hx509') diff --git a/source4/heimdal/lib/hx509/sel-gram.c b/source4/heimdal/lib/hx509/sel-gram.c index bab1191b93..8461c16e73 100644 --- a/source4/heimdal/lib/hx509/sel-gram.c +++ b/source4/heimdal/lib/hx509/sel-gram.c @@ -68,7 +68,7 @@ /* Copy the first part of user declarations. */ /* Line 189 of yacc.c */ -#line 34 "sel-gram.y" +#line 34 "heimdal/lib/hx509/sel-gram.y" #ifdef HAVE_CONFIG_H #include @@ -81,7 +81,7 @@ /* Line 189 of yacc.c */ -#line 85 "sel-gram.c" +#line 85 "heimdal/lib/hx509/sel-gram.y" /* Enabling traces. */ #ifndef YYDEBUG @@ -138,7 +138,7 @@ typedef union YYSTYPE { /* Line 214 of yacc.c */ -#line 45 "sel-gram.y" +#line 45 "heimdal/lib/hx509/sel-gram.y" char *string; struct hx_expr *expr; @@ -146,7 +146,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 150 "sel-gram.c" +#line 150 "heimdal/lib/hx509/sel-gram.y" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -158,7 +158,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 162 "sel-gram.c" +#line 162 "heimdal/lib/hx509/sel-gram.y" #ifdef short # undef short @@ -1381,154 +1381,154 @@ yyreduce: case 2: /* Line 1455 of yacc.c */ -#line 73 "sel-gram.y" +#line 73 "heimdal/lib/hx509/sel-gram.y" { _hx509_expr_input.expr = (yyvsp[(1) - (1)].expr); } break; case 3: /* Line 1455 of yacc.c */ -#line 75 "sel-gram.y" +#line 75 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(op_TRUE, NULL, NULL); } break; case 4: /* Line 1455 of yacc.c */ -#line 76 "sel-gram.y" +#line 76 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(op_FALSE, NULL, NULL); } break; case 5: /* Line 1455 of yacc.c */ -#line 77 "sel-gram.y" +#line 77 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(op_NOT, (yyvsp[(2) - (2)].expr), NULL); } break; case 6: /* Line 1455 of yacc.c */ -#line 78 "sel-gram.y" +#line 78 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(op_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 7: /* Line 1455 of yacc.c */ -#line 79 "sel-gram.y" +#line 79 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(op_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 8: /* Line 1455 of yacc.c */ -#line 80 "sel-gram.y" +#line 80 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); } break; case 9: /* Line 1455 of yacc.c */ -#line 81 "sel-gram.y" +#line 81 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(op_COMP, (yyvsp[(1) - (1)].expr), NULL); } break; case 10: /* Line 1455 of yacc.c */ -#line 84 "sel-gram.y" +#line 84 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(expr_WORDS, (yyvsp[(1) - (1)].expr), NULL); } break; case 11: /* Line 1455 of yacc.c */ -#line 85 "sel-gram.y" +#line 85 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(expr_WORDS, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 12: /* Line 1455 of yacc.c */ -#line 88 "sel-gram.y" +#line 88 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(comp_EQ, (yyvsp[(1) - (4)].expr), (yyvsp[(4) - (4)].expr)); } break; case 13: /* Line 1455 of yacc.c */ -#line 89 "sel-gram.y" +#line 89 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(comp_NE, (yyvsp[(1) - (4)].expr), (yyvsp[(4) - (4)].expr)); } break; case 14: /* Line 1455 of yacc.c */ -#line 90 "sel-gram.y" +#line 90 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(comp_TAILEQ, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 15: /* Line 1455 of yacc.c */ -#line 91 "sel-gram.y" +#line 91 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(comp_IN, (yyvsp[(1) - (5)].expr), (yyvsp[(4) - (5)].expr)); } break; case 16: /* Line 1455 of yacc.c */ -#line 92 "sel-gram.y" +#line 92 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(comp_IN, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 17: /* Line 1455 of yacc.c */ -#line 95 "sel-gram.y" +#line 95 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 18: /* Line 1455 of yacc.c */ -#line 96 "sel-gram.y" +#line 96 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 19: /* Line 1455 of yacc.c */ -#line 97 "sel-gram.y" +#line 97 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 20: /* Line 1455 of yacc.c */ -#line 98 "sel-gram.y" +#line 98 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 21: /* Line 1455 of yacc.c */ -#line 101 "sel-gram.y" +#line 101 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(expr_NUMBER, (yyvsp[(1) - (1)].string), NULL); } break; case 22: /* Line 1455 of yacc.c */ -#line 102 "sel-gram.y" +#line 102 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(expr_STRING, (yyvsp[(1) - (1)].string), NULL); } break; case 23: /* Line 1455 of yacc.c */ -#line 104 "sel-gram.y" +#line 104 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(expr_FUNCTION, (yyvsp[(1) - (4)].string), (yyvsp[(3) - (4)].expr)); } break; @@ -1536,14 +1536,14 @@ yyreduce: case 24: /* Line 1455 of yacc.c */ -#line 107 "sel-gram.y" +#line 107 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = (yyvsp[(3) - (4)].expr); } break; case 25: /* Line 1455 of yacc.c */ -#line 110 "sel-gram.y" +#line 110 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(expr_VAR, (yyvsp[(1) - (3)].string), (yyvsp[(3) - (3)].expr)); } break; @@ -1551,7 +1551,7 @@ yyreduce: case 26: /* Line 1455 of yacc.c */ -#line 112 "sel-gram.y" +#line 112 "heimdal/lib/hx509/sel-gram.y" { (yyval.expr) = _hx509_make_expr(expr_VAR, (yyvsp[(1) - (1)].string), NULL); } break; @@ -1559,7 +1559,7 @@ yyreduce: /* Line 1455 of yacc.c */ -#line 1563 "sel-gram.c" +#line 1563 "heimdal/lib/hx509/sel-gram.y" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); diff --git a/source4/heimdal/lib/hx509/sel-gram.h b/source4/heimdal/lib/hx509/sel-gram.h index 07bd78865e..e98343fdd1 100644 --- a/source4/heimdal/lib/hx509/sel-gram.h +++ b/source4/heimdal/lib/hx509/sel-gram.h @@ -69,7 +69,7 @@ typedef union YYSTYPE { /* Line 1676 of yacc.c */ -#line 45 "sel-gram.y" +#line 45 "heimdal/lib/hx509/sel-gram.y" char *string; struct hx_expr *expr; @@ -77,7 +77,7 @@ typedef union YYSTYPE /* Line 1676 of yacc.c */ -#line 81 "sel-gram.h" +#line 81 "heimdal/lib/hx509/sel-gram.y" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/source4/heimdal/lib/hx509/sel-lex.c b/source4/heimdal/lib/hx509/sel-lex.c index 8ff0698627..8182eecb9b 100644 --- a/source4/heimdal/lib/hx509/sel-lex.c +++ b/source4/heimdal/lib/hx509/sel-lex.c @@ -1,5 +1,6 @@ +#include "config.h" -#line 3 "sel-lex.c" +#line 3 "heimdal/lib/hx509/sel-lex.c" #define YY_INT_ALIGNED short int @@ -53,7 +54,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,6 +84,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -140,7 +142,15 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -530,7 +540,7 @@ struct hx_expr_input _hx509_expr_input; #undef ECHO -#line 534 "sel-lex.c" +#line 543 "heimdal/lib/hx509/sel-lex.c" #define INITIAL 0 @@ -611,7 +621,12 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -619,7 +634,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -630,7 +645,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - unsigned n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -715,7 +730,7 @@ YY_DECL #line 64 "sel-lex.l" -#line 719 "sel-lex.c" +#line 733 "heimdal/lib/hx509/sel-lex.c" if ( !(yy_init) ) { @@ -862,7 +877,7 @@ YY_RULE_SETUP #line 81 "sel-lex.l" ECHO; YY_BREAK -#line 866 "sel-lex.c" +#line 880 "heimdal/lib/hx509/sel-lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1620,8 +1635,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -- cgit