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/com_err/lex.c | 33 ++++++++++++++++++++++++--------- source4/heimdal/lib/com_err/parse.c | 30 +++++++++++++++--------------- source4/heimdal/lib/com_err/parse.h | 4 ++-- 3 files changed, 41 insertions(+), 26 deletions(-) (limited to 'source4/heimdal/lib/com_err') diff --git a/source4/heimdal/lib/com_err/lex.c b/source4/heimdal/lib/com_err/lex.c index 1b6473966b..94d5934699 100644 --- a/source4/heimdal/lib/com_err/lex.c +++ b/source4/heimdal/lib/com_err/lex.c @@ -1,5 +1,6 @@ +#include "config.h" -#line 3 "lex.c" +#line 3 "heimdal/lib/com_err/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. @@ -526,7 +536,7 @@ static int getstring(void); #undef ECHO -#line 530 "lex.c" +#line 539 "heimdal/lib/com_err/lex.c" #define INITIAL 0 @@ -607,7 +617,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. */ @@ -615,7 +630,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, @@ -626,7 +641,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; \ @@ -710,7 +725,7 @@ YY_DECL #line 57 "lex.l" -#line 714 "lex.c" +#line 728 "heimdal/lib/com_err/lex.c" if ( !(yy_init) ) { @@ -874,7 +889,7 @@ YY_RULE_SETUP #line 73 "lex.l" ECHO; YY_BREAK -#line 878 "lex.c" +#line 892 "heimdal/lib/com_err/lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1632,8 +1647,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. */ diff --git a/source4/heimdal/lib/com_err/parse.c b/source4/heimdal/lib/com_err/parse.c index 23d8f55df8..4e087e4a95 100644 --- a/source4/heimdal/lib/com_err/parse.c +++ b/source4/heimdal/lib/com_err/parse.c @@ -68,7 +68,7 @@ /* Copy the first part of user declarations. */ /* Line 189 of yacc.c */ -#line 1 "parse.y" +#line 1 "heimdal/lib/com_err/parse.y" /* * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan @@ -120,7 +120,7 @@ extern char *yytext; /* Line 189 of yacc.c */ -#line 124 "parse.c" +#line 124 "heimdal/lib/com_err/parse.y" /* Enabling traces. */ #ifndef YYDEBUG @@ -175,7 +175,7 @@ typedef union YYSTYPE { /* Line 214 of yacc.c */ -#line 51 "parse.y" +#line 51 "heimdal/lib/com_err/parse.y" char *string; int number; @@ -183,7 +183,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 187 "parse.c" +#line 187 "heimdal/lib/com_err/parse.y" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -195,7 +195,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 199 "parse.c" +#line 199 "heimdal/lib/com_err/parse.y" #ifdef short # undef short @@ -1393,7 +1393,7 @@ yyreduce: case 6: /* Line 1455 of yacc.c */ -#line 71 "parse.y" +#line 71 "heimdal/lib/com_err/parse.y" { id_str = (yyvsp[(2) - (2)].string); } @@ -1402,7 +1402,7 @@ yyreduce: case 7: /* Line 1455 of yacc.c */ -#line 77 "parse.y" +#line 77 "heimdal/lib/com_err/parse.y" { base_id = name2number((yyvsp[(2) - (2)].string)); strlcpy(name, (yyvsp[(2) - (2)].string), sizeof(name)); @@ -1413,7 +1413,7 @@ yyreduce: case 8: /* Line 1455 of yacc.c */ -#line 83 "parse.y" +#line 83 "heimdal/lib/com_err/parse.y" { base_id = name2number((yyvsp[(2) - (3)].string)); strlcpy(name, (yyvsp[(3) - (3)].string), sizeof(name)); @@ -1425,7 +1425,7 @@ yyreduce: case 11: /* Line 1455 of yacc.c */ -#line 96 "parse.y" +#line 96 "heimdal/lib/com_err/parse.y" { number = (yyvsp[(2) - (2)].number); } @@ -1434,7 +1434,7 @@ yyreduce: case 12: /* Line 1455 of yacc.c */ -#line 100 "parse.y" +#line 100 "heimdal/lib/com_err/parse.y" { free(prefix); asprintf (&prefix, "%s_", (yyvsp[(2) - (2)].string)); @@ -1447,7 +1447,7 @@ yyreduce: case 13: /* Line 1455 of yacc.c */ -#line 108 "parse.y" +#line 108 "heimdal/lib/com_err/parse.y" { prefix = realloc(prefix, 1); if (prefix == NULL) @@ -1459,7 +1459,7 @@ yyreduce: case 14: /* Line 1455 of yacc.c */ -#line 115 "parse.y" +#line 115 "heimdal/lib/com_err/parse.y" { struct error_code *ec = malloc(sizeof(*ec)); @@ -1484,7 +1484,7 @@ yyreduce: case 15: /* Line 1455 of yacc.c */ -#line 135 "parse.y" +#line 135 "heimdal/lib/com_err/parse.y" { YYACCEPT; } @@ -1493,7 +1493,7 @@ yyreduce: /* Line 1455 of yacc.c */ -#line 1497 "parse.c" +#line 1497 "heimdal/lib/com_err/parse.y" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -1705,7 +1705,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 140 "parse.y" +#line 140 "heimdal/lib/com_err/parse.y" static long diff --git a/source4/heimdal/lib/com_err/parse.h b/source4/heimdal/lib/com_err/parse.h index 17006678f4..9d35308220 100644 --- a/source4/heimdal/lib/com_err/parse.h +++ b/source4/heimdal/lib/com_err/parse.h @@ -67,7 +67,7 @@ typedef union YYSTYPE { /* Line 1676 of yacc.c */ -#line 51 "parse.y" +#line 51 "heimdal/lib/com_err/parse.y" char *string; int number; @@ -75,7 +75,7 @@ typedef union YYSTYPE /* Line 1676 of yacc.c */ -#line 79 "parse.h" +#line 79 "heimdal/lib/com_err/parse.y" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ -- cgit