From 80e23c68d83a7c9989f87d5a88a78bb76d222afc Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 25 Feb 2011 20:34:07 +1100
Subject: heimdal_build omit #line statments to allow valgrind to work again

The lex/yacc files were generated on Fedora 14, and have empty
filenames in #line declarations.  I don't know why this is, but it
seems best just to omit the #line statements.

This is what was causing Valgrind on Fedora not to run on Samba
binaries and programs linked to Samba libraries.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Feb 25 11:46:56 CET 2011 on sn-devel-104
---
 source4/heimdal/lib/com_err/lex.c   | 29 -----------------------------
 source4/heimdal/lib/com_err/parse.c | 14 --------------
 2 files changed, 43 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 9a61f5902b..6b2730d900 100644
--- a/source4/heimdal/lib/com_err/lex.c
+++ b/source4/heimdal/lib/com_err/lex.c
@@ -473,8 +473,6 @@ int yy_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "lex.l"
-#line 2 "lex.l"
 /*
  * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -527,8 +525,6 @@ static int getstring(void);
 
 #undef ECHO
 
-#line 530 ""
-
 #define INITIAL 0
 
 #ifndef YY_NO_UNISTD_H
@@ -707,10 +703,6 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 58 "lex.l"
-
-#line 712 ""
-
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -794,86 +786,69 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 59 "lex.l"
 { return ET; }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 60 "lex.l"
 { return ET; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 61 "lex.l"
 { return EC; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 62 "lex.l"
 { return EC; }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 63 "lex.l"
 { return PREFIX; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 64 "lex.l"
 { return INDEX; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 65 "lex.l"
 { return ID; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 66 "lex.l"
 { return END; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 67 "lex.l"
 { yylval.number = atoi(yytext); return NUMBER; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 68 "lex.l"
 ;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 69 "lex.l"
 ;
 	YY_BREAK
 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
-#line 70 "lex.l"
 { lineno++; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 71 "lex.l"
 { return getstring(); }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 72 "lex.l"
 { yylval.string = strdup(yytext); return STRING; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 73 "lex.l"
 { return *yytext; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 74 "lex.l"
 ECHO;
 	YY_BREAK
-#line 876 ""
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1834,10 +1809,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 74 "lex.l"
-
-
-
 #ifndef yywrap /* XXX */
 int
 yywrap ()
diff --git a/source4/heimdal/lib/com_err/parse.c b/source4/heimdal/lib/com_err/parse.c
index a97c56f0b2..15e9f656f2 100644
--- a/source4/heimdal/lib/com_err/parse.c
+++ b/source4/heimdal/lib/com_err/parse.c
@@ -31,7 +31,6 @@ static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
 
 extern int YYPARSE_DECL();
 
-#line 2 ""
 /*
  * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -82,12 +81,10 @@ extern char *yytext;
 #define YYMALLOC malloc
 #define YYFREE free
 
-#line 54 ""
 typedef union {
   char *string;
   int number;
 } YYSTYPE;
-#line 90 ""
 #define ET 257
 #define INDEX 258
 #define PREFIX 259
@@ -261,7 +258,6 @@ YYSTYPE  yylval;
 
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
-#line 144 ""
 
 static long
 name2number(const char *str)
@@ -293,7 +289,6 @@ yyerror (char *s)
 {
      _lex_error_message ("%s\n", s);
 }
-#line 296 ""
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 static int yygrowstack(YYSTACKDATA *data)
 {
@@ -496,13 +491,11 @@ yyreduce:
     switch (yyn)
     {
 case 5:
-#line 74 ""
 	{
 		    id_str = yystack.l_mark[0].string;
 		}
 break;
 case 6:
-#line 80 ""
 	{
 		    base_id = name2number(yystack.l_mark[0].string);
 		    strlcpy(name, yystack.l_mark[0].string, sizeof(name));
@@ -510,7 +503,6 @@ case 6:
 		}
 break;
 case 7:
-#line 86 ""
 	{
 		    base_id = name2number(yystack.l_mark[-1].string);
 		    strlcpy(name, yystack.l_mark[0].string, sizeof(name));
@@ -519,13 +511,11 @@ case 7:
 		}
 break;
 case 10:
-#line 99 ""
 	{
 			number = yystack.l_mark[0].number;
 		}
 break;
 case 11:
-#line 103 ""
 	{
 		    free(prefix);
 		    asprintf (&prefix, "%s_", yystack.l_mark[0].string);
@@ -535,7 +525,6 @@ case 11:
 		}
 break;
 case 12:
-#line 111 ""
 	{
 		    prefix = realloc(prefix, 1);
 		    if (prefix == NULL)
@@ -544,7 +533,6 @@ case 12:
 		}
 break;
 case 13:
-#line 118 ""
 	{
 		    struct error_code *ec = malloc(sizeof(*ec));
 		
@@ -566,12 +554,10 @@ case 13:
 		}
 break;
 case 14:
-#line 138 ""
 	{
 			YYACCEPT;
 		}
 break;
-#line 574 ""
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
-- 
cgit