diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-29 11:46:44 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-30 23:48:59 +1100 |
| commit | 4bd7814a4e2970a1276b91b93987ce4fa9406c19 (patch) | |
| tree | be4d9bc1d7afd692278c4df9e6cd6c24eeb71a81 /source4/heimdal/lib/asn1/lex.l | |
| parent | d6299d2667909487986782afc596cca45f2cbdac (diff) | |
| download | samba-4bd7814a4e2970a1276b91b93987ce4fa9406c19.tar.gz samba-4bd7814a4e2970a1276b91b93987ce4fa9406c19.tar.bz2 samba-4bd7814a4e2970a1276b91b93987ce4fa9406c19.zip | |
s4-heimdal: fixed the use of error_message() in heimdal
the lex code in heimdal had a function error_message() which conflicts
with a function from the com_err library. This replaces it with
lex_err_message()
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/heimdal/lib/asn1/lex.l')
| -rw-r--r-- | source4/heimdal/lib/asn1/lex.l | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source4/heimdal/lib/asn1/lex.l b/source4/heimdal/lib/asn1/lex.l index 7bd442bc50..d5be97538f 100644 --- a/source4/heimdal/lib/asn1/lex.l +++ b/source4/heimdal/lib/asn1/lex.l @@ -50,6 +50,8 @@ #include "lex.h" #include "gen_locl.h" +static void lex_err_message (const char *format, ...); + static unsigned lineno = 1; #undef ECHO @@ -258,7 +260,7 @@ WITH { return kw_WITH; } yylval.constant = strtol((const char *)yytext, &e, 0); if(e == y) - error_message("malformed constant (%s)", yytext); + lex_err_message("malformed constant (%s)", yytext); else return NUMBER; } @@ -270,7 +272,7 @@ WITH { return kw_WITH; } \n { ++lineno; } \.\.\. { return ELLIPSIS; } \.\. { return RANGE; } -. { error_message("Ignoring char(%c)\n", *yytext); } +. { lex_err_message("Ignoring char(%c)\n", *yytext); } %% #ifndef yywrap /* XXX */ @@ -281,8 +283,8 @@ yywrap () } #endif -void -error_message (const char *format, ...) +static void +lex_err_message (const char *format, ...) { va_list args; @@ -296,5 +298,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_err_message("unterminated %s, possibly started on line %d\n", type, start_lineno); } |