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/com_err | |
| 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/com_err')
| -rw-r--r-- | source4/heimdal/lib/com_err/lex.c | 4 | ||||
| -rw-r--r-- | source4/heimdal/lib/com_err/lex.h | 2 | ||||
| -rw-r--r-- | source4/heimdal/lib/com_err/lex.l | 4 | ||||
| -rw-r--r-- | source4/heimdal/lib/com_err/parse.c | 2 | ||||
| -rw-r--r-- | source4/heimdal/lib/com_err/parse.y | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/source4/heimdal/lib/com_err/lex.c b/source4/heimdal/lib/com_err/lex.c index 9afc27a6be..3b17cd7035 100644 --- a/source4/heimdal/lib/com_err/lex.c +++ b/source4/heimdal/lib/com_err/lex.c @@ -1899,7 +1899,7 @@ getstring(void) continue; } if(c == '\n'){ - error_message("unterminated string"); + lex_err_message("unterminated string"); lineno++; break; } @@ -1919,7 +1919,7 @@ getstring(void) } void -error_message (const char *format, ...) +lex_err_message (const char *format, ...) { va_list args; diff --git a/source4/heimdal/lib/com_err/lex.h b/source4/heimdal/lib/com_err/lex.h index 76f3e2b2a5..abfec922f0 100644 --- a/source4/heimdal/lib/com_err/lex.h +++ b/source4/heimdal/lib/com_err/lex.h @@ -33,7 +33,7 @@ /* $Id$ */ -void error_message (const char *, ...) +void lex_err_message (const char *, ...) __attribute__ ((format (printf, 1, 2))); int yylex(void); diff --git a/source4/heimdal/lib/com_err/lex.l b/source4/heimdal/lib/com_err/lex.l index b68814b21c..f099c1e1bd 100644 --- a/source4/heimdal/lib/com_err/lex.l +++ b/source4/heimdal/lib/com_err/lex.l @@ -94,7 +94,7 @@ getstring(void) continue; } if(c == '\n'){ - error_message("unterminated string"); + lex_err_message("unterminated string"); lineno++; break; } @@ -114,7 +114,7 @@ getstring(void) } void -error_message (const char *format, ...) +lex_err_message (const char *format, ...) { va_list args; diff --git a/source4/heimdal/lib/com_err/parse.c b/source4/heimdal/lib/com_err/parse.c index 4e087e4a95..73a2c1c35c 100644 --- a/source4/heimdal/lib/com_err/parse.c +++ b/source4/heimdal/lib/com_err/parse.c @@ -1736,6 +1736,6 @@ name2number(const char *str) void yyerror (char *s) { - error_message ("%s\n", s); + lex_err_message ("%s\n", s); } diff --git a/source4/heimdal/lib/com_err/parse.y b/source4/heimdal/lib/com_err/parse.y index d64681d902..f1ae64d97e 100644 --- a/source4/heimdal/lib/com_err/parse.y +++ b/source4/heimdal/lib/com_err/parse.y @@ -167,5 +167,5 @@ name2number(const char *str) void yyerror (char *s) { - error_message ("%s\n", s); + lex_err_message ("%s\n", s); } |