From 1342185e333cb8139b7a70b7fe43571bcc2716a7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 11 Nov 2010 11:27:33 +1100
Subject: s4:heimdal: import lorikeet-heimdal-201011102149 (commit
 5734d03c20e104c8f45533d07f2a2cbbd3224f29)

---
 source4/heimdal/lib/com_err/lex.h   | 2 +-
 source4/heimdal/lib/com_err/lex.l   | 4 ++--
 source4/heimdal/lib/com_err/parse.y | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/heimdal/lib/com_err')

diff --git a/source4/heimdal/lib/com_err/lex.h b/source4/heimdal/lib/com_err/lex.h
index abfec922f0..76f3e2b2a5 100644
--- a/source4/heimdal/lib/com_err/lex.h
+++ b/source4/heimdal/lib/com_err/lex.h
@@ -33,7 +33,7 @@
 
 /* $Id$ */
 
-void lex_err_message (const char *, ...)
+void 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 f099c1e1bd..b68814b21c 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'){
-	    lex_err_message("unterminated string");
+	    error_message("unterminated string");
 	    lineno++;
 	    break;
 	}
@@ -114,7 +114,7 @@ getstring(void)
 }
 
 void
-lex_err_message (const char *format, ...)
+error_message (const char *format, ...)
 {
      va_list args;
 
diff --git a/source4/heimdal/lib/com_err/parse.y b/source4/heimdal/lib/com_err/parse.y
index f1ae64d97e..d64681d902 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)
 {
-     lex_err_message ("%s\n", s);
+     error_message ("%s\n", s);
 }
-- 
cgit