diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-01-31 15:59:06 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-02 15:19:03 +1100 |
| commit | 2d9bcc861d6b2cd67d7c6439e90d9ac4a600f0f2 (patch) | |
| tree | ce681728eb91875b60b70d34247a0f07772ec411 /source4/heimdal/lib/com_err | |
| parent | 3d4a9ddc244bd4937af9ff1c6e898ab45a7d28b5 (diff) | |
| download | samba-2d9bcc861d6b2cd67d7c6439e90d9ac4a600f0f2.tar.gz samba-2d9bcc861d6b2cd67d7c6439e90d9ac4a600f0f2.tar.bz2 samba-2d9bcc861d6b2cd67d7c6439e90d9ac4a600f0f2.zip | |
s4:heimdal: import lorikeet-heimdal-201101310455 (commit aa88eb1a05c4985cc23fb65fc1bad75bdce01c1f)
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 f107bba5bd..9a61f5902b 100644 --- a/source4/heimdal/lib/com_err/lex.c +++ b/source4/heimdal/lib/com_err/lex.c @@ -1860,7 +1860,7 @@ getstring(void) continue; } if(c == '\n'){ - lex_error_message("unterminated string"); + _lex_error_message("unterminated string"); lineno++; break; } @@ -1880,7 +1880,7 @@ getstring(void) } void -lex_error_message (const char *format, ...) +_lex_error_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 6c9be77ddf..e158816bbb 100644 --- a/source4/heimdal/lib/com_err/lex.h +++ b/source4/heimdal/lib/com_err/lex.h @@ -33,7 +33,7 @@ /* $Id$ */ -void lex_error_message (const char *, ...) +void _lex_error_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 ac660a1d8c..eb39e0cfb8 100644 --- a/source4/heimdal/lib/com_err/lex.l +++ b/source4/heimdal/lib/com_err/lex.l @@ -95,7 +95,7 @@ getstring(void) continue; } if(c == '\n'){ - lex_error_message("unterminated string"); + _lex_error_message("unterminated string"); lineno++; break; } @@ -115,7 +115,7 @@ getstring(void) } void -lex_error_message (const char *format, ...) +_lex_error_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 b2b0fc1090..a97c56f0b2 100644 --- a/source4/heimdal/lib/com_err/parse.c +++ b/source4/heimdal/lib/com_err/parse.c @@ -291,7 +291,7 @@ name2number(const char *str) void yyerror (char *s) { - lex_error_message ("%s\n", s); + _lex_error_message ("%s\n", s); } #line 296 "" /* allocate initial stack or double stack size, up to YYMAXDEPTH */ diff --git a/source4/heimdal/lib/com_err/parse.y b/source4/heimdal/lib/com_err/parse.y index f628e8804f..194965c349 100644 --- a/source4/heimdal/lib/com_err/parse.y +++ b/source4/heimdal/lib/com_err/parse.y @@ -170,5 +170,5 @@ name2number(const char *str) void yyerror (char *s) { - lex_error_message ("%s\n", s); + _lex_error_message ("%s\n", s); } |