oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

heimdal: fixed the use of error_message() in heimdal

Browse Source 
the lex code in heimdal had a function error_message() which is
confusingly the ame as a core function from the com_err library. This
replaces it with lex_error_message(), and allows Samba4 to have a
stricter check for duplicate symbols between it's components.

Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>

Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
This commit is contained in:
Andrew Bartlett
2010-11-09 08:27:18 +11:00
committed by Love Hornquist Astrand
parent 2e31740f62
commit 2e34d7cf6e
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/asn1/lex.l
View File

@@ -258,7 +258,7 @@ WITH { return kw_WITH; }
yylval.constant = strtol((const char *)yytext,
&e, 0);
if(e == y)
error_message("malformed constant (%s)", yytext);
lex_error_message("malformed constant (%s)", yytext);
else
return NUMBER;
}
@@ -270,7 +270,7 @@ WITH { return kw_WITH; }
\n { ++lineno; }
\.\.\. { return ELLIPSIS; }
\.\. { return RANGE; }
. { error_message("Ignoring char(%c)\n", *yytext); }
. { lex_error_message("Ignoring char(%c)\n", *yytext); }
%%
#ifndef yywrap /* XXX */
@@ -282,7 +282,7 @@ yywrap ()
#endif
void
error_message (const char *format, ...)
lex_error_message (const char *format, ...)
{
va_list args;
@@ -296,5 +296,5 @@ error_message (const char *format, ...)
static void
unterminated(const char *type, unsigned start_lineno)
{
error_message("unterminated %s, possibly started on line %d\n", type, start_lineno);
lex_error_message("unterminated %s, possibly started on line %d\n", type, start_lineno);
}