From 995d305f8ceb8a275aa4b749bbfc94d918e21a64 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 25 Jan 2011 18:27:12 -0800 Subject: [PATCH] lib/com_err only use error_message for the exported libcom_err This avoids using the same function name in compile_et internally Andrew Bartlett Signed-off-by: Love Hornquist Astrand --- lib/com_err/lex.h | 2 +- lib/com_err/lex.l | 4 ++-- lib/com_err/parse.y | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/com_err/lex.h b/lib/com_err/lex.h index 76f3e2b2a..e158816bb 100644 --- a/lib/com_err/lex.h +++ b/lib/com_err/lex.h @@ -33,7 +33,7 @@ /* $Id$ */ -void error_message (const char *, ...) +void _lex_error_message (const char *, ...) __attribute__ ((format (printf, 1, 2))); int yylex(void); diff --git a/lib/com_err/lex.l b/lib/com_err/lex.l index b17c9d67a..eb39e0cfb 100644 --- a/lib/com_err/lex.l +++ b/lib/com_err/lex.l @@ -95,7 +95,7 @@ getstring(void) continue; } if(c == '\n'){ - error_message("unterminated string"); + _lex_error_message("unterminated string"); lineno++; break; } @@ -115,7 +115,7 @@ getstring(void) } void -error_message (const char *format, ...) +_lex_error_message (const char *format, ...) { va_list args; diff --git a/lib/com_err/parse.y b/lib/com_err/parse.y index 3472f82e0..194965c34 100644 --- a/lib/com_err/parse.y +++ b/lib/com_err/parse.y @@ -170,5 +170,5 @@ name2number(const char *str) void yyerror (char *s) { - error_message ("%s\n", s); + _lex_error_message ("%s\n", s); }