diff options
author | nectar <nectar@FreeBSD.org> | 2004-04-03 21:17:01 +0000 |
---|---|---|
committer | nectar <nectar@FreeBSD.org> | 2004-04-03 21:17:01 +0000 |
commit | 51d0d2403952fc6bc99c3bba749cecc4a7b736b1 (patch) | |
tree | ece6a707d8c4b0cbe892a48245084c0c427ee3cb /contrib/com_err/lex.l | |
parent | b60761ab5cb1fac54d3c5076178e54776f0136d1 (diff) | |
download | FreeBSD-src-51d0d2403952fc6bc99c3bba749cecc4a7b736b1.zip FreeBSD-src-51d0d2403952fc6bc99c3bba749cecc4a7b736b1.tar.gz |
Resolve conflicts after import of Heimdal 0.6.1 libcom_err.
Diffstat (limited to 'contrib/com_err/lex.l')
-rw-r--r-- | contrib/com_err/lex.l | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/contrib/com_err/lex.l b/contrib/com_err/lex.l index 264ad6f..b5f8db1 100644 --- a/contrib/com_err/lex.l +++ b/contrib/com_err/lex.l @@ -1,6 +1,6 @@ %{ /* - * Copyright (c) 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -15,12 +15,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Kungliga Tekniska - * Högskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 3. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -36,6 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* $FreeBSD$ */ /* * This is to handle the definition of this symbol in some AIX @@ -47,14 +43,18 @@ #include "compile_et.h" #include "parse.h" +#include "lex.h" #if 0 -RCSID("$Id: lex.l,v 1.4 1998/11/20 05:58:52 assar Exp $"); +RCSID("$Id: lex.l,v 1.6 2000/06/22 00:42:52 assar Exp $"); #endif static unsigned lineno = 1; -void error_message(char *, ...); -int getstring(void); +static int getstring(void); + +#define YY_NO_UNPUT + +#undef ECHO %} @@ -85,7 +85,7 @@ yywrap () } #endif -int +static int getstring(void) { char x[128]; @@ -117,7 +117,7 @@ getstring(void) } void -error_message (char *format, ...) +error_message (const char *format, ...) { va_list args; |