summaryrefslogtreecommitdiff
path: root/source4/heimdal/lib/com_err
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2011-02-25 11:54:02 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2011-02-25 11:54:02 +0100
commit68c61a829b8487104483b23052b54c532fecb6ce (patch)
treeb9aaab8437d523b0d6672744b46189bc8e7885c7 /source4/heimdal/lib/com_err
parent80e23c68d83a7c9989f87d5a88a78bb76d222afc (diff)
downloadsamba-68c61a829b8487104483b23052b54c532fecb6ce.tar.gz
samba-68c61a829b8487104483b23052b54c532fecb6ce.tar.bz2
samba-68c61a829b8487104483b23052b54c532fecb6ce.zip
Revert "heimdal_build omit #line statments to allow valgrind to work again"
This reverts commit 80e23c68d83a7c9989f87d5a88a78bb76d222afc. A better patch has been provided by Milan Crha in the following commit.
Diffstat (limited to 'source4/heimdal/lib/com_err')
-rw-r--r--source4/heimdal/lib/com_err/lex.c29
-rw-r--r--source4/heimdal/lib/com_err/parse.c14
2 files changed, 43 insertions, 0 deletions
diff --git a/source4/heimdal/lib/com_err/lex.c b/source4/heimdal/lib/com_err/lex.c
index 6b2730d900..9a61f5902b 100644
--- a/source4/heimdal/lib/com_err/lex.c
+++ b/source4/heimdal/lib/com_err/lex.c
@@ -473,6 +473,8 @@ 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).
@@ -525,6 +527,8 @@ static int getstring(void);
#undef ECHO
+#line 530 ""
+
#define INITIAL 0
#ifndef YY_NO_UNISTD_H
@@ -703,6 +707,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
+#line 58 "lex.l"
+
+#line 712 ""
+
if ( !(yy_init) )
{
(yy_init) = 1;
@@ -786,69 +794,86 @@ 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();
@@ -1809,6 +1834,10 @@ 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 15e9f656f2..a97c56f0b2 100644
--- a/source4/heimdal/lib/com_err/parse.c
+++ b/source4/heimdal/lib/com_err/parse.c
@@ -31,6 +31,7 @@ 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).
@@ -81,10 +82,12 @@ 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
@@ -258,6 +261,7 @@ YYSTYPE yylval;
/* variables for the parser stack */
static YYSTACKDATA yystack;
+#line 144 ""
static long
name2number(const char *str)
@@ -289,6 +293,7 @@ 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)
{
@@ -491,11 +496,13 @@ 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));
@@ -503,6 +510,7 @@ case 6:
}
break;
case 7:
+#line 86 ""
{
base_id = name2number(yystack.l_mark[-1].string);
strlcpy(name, yystack.l_mark[0].string, sizeof(name));
@@ -511,11 +519,13 @@ 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);
@@ -525,6 +535,7 @@ case 11:
}
break;
case 12:
+#line 111 ""
{
prefix = realloc(prefix, 1);
if (prefix == NULL)
@@ -533,6 +544,7 @@ case 12:
}
break;
case 13:
+#line 118 ""
{
struct error_code *ec = malloc(sizeof(*ec));
@@ -554,10 +566,12 @@ case 13:
}
break;
case 14:
+#line 138 ""
{
YYACCEPT;
}
break;
+#line 574 ""
}
yystack.s_mark -= yym;
yystate = *yystack.s_mark;