From owner-svn-src-stable-9@FreeBSD.ORG  Sat Sep 15 18:53:01 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 72E551065675;
	Sat, 15 Sep 2012 18:53:01 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D3158FC08;
	Sat, 15 Sep 2012 18:53:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8FIr1fv009785;
	Sat, 15 Sep 2012 18:53:01 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8FIr16a009782;
	Sat, 15 Sep 2012 18:53:01 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201209151853.q8FIr16a009782@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 15 Sep 2012 18:53:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240537 - in stable/9/usr.bin: mkcsmapper mkesdb
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Sep 2012 18:53:01 -0000

Author: dim
Date: Sat Sep 15 18:53:00 2012
New Revision: 240537
URL: http://svn.freebsd.org/changeset/base/240537

Log:
  MFC r238197:
  
    Fix spelling
  
    PR:		bin/167480
    Submitted by:	zeising
    Approved by:	cperciva
  
  MFC r240365:
  
    Ensure mkcsmapper and mkesdb compile with clang, if WITH_ICONV is
    defined.
  
    PR:		bin/167481
    Submitted by:	zeising

Modified:
  stable/9/usr.bin/mkcsmapper/lex.l
  stable/9/usr.bin/mkesdb/lex.l
Directory Properties:
  stable/9/usr.bin/mkcsmapper/   (props changed)
  stable/9/usr.bin/mkesdb/   (props changed)

Modified: stable/9/usr.bin/mkcsmapper/lex.l
==============================================================================
--- stable/9/usr.bin/mkcsmapper/lex.l	Sat Sep 15 18:34:12 2012	(r240536)
+++ stable/9/usr.bin/mkcsmapper/lex.l	Sat Sep 15 18:53:00 2012	(r240537)
@@ -43,6 +43,7 @@
 
 int line_number = 1;
 %}
+%option	noinput
 %option	nounput
 
 %x	COMMENT
@@ -57,7 +58,7 @@ int line_number = 1;
 <COMMENT>[\n]	{ line_number++; }
 <COMMENT>.	{ }
 <COMMENT><<EOF>>	{
-		yyerror("unexpected file end (unterminate comment)\n");
+		yyerror("unexpected file end (unterminated comment)\n");
 		exit(1);
 	}
 

Modified: stable/9/usr.bin/mkesdb/lex.l
==============================================================================
--- stable/9/usr.bin/mkesdb/lex.l	Sat Sep 15 18:34:12 2012	(r240536)
+++ stable/9/usr.bin/mkesdb/lex.l	Sat Sep 15 18:53:00 2012	(r240537)
@@ -45,6 +45,7 @@
 
 int line_number = 1;
 %}
+%option	noinput
 %option	nounput
 
 %x	COMMENT
@@ -59,7 +60,7 @@ int line_number = 1;
 <COMMENT>[\n]	{ line_number++; }
 <COMMENT>.	{ }
 <COMMENT><<EOF>>	{
-		yyerror("unexpected file end (unterminate comment)\n");
+		yyerror("unexpected file end (unterminated comment)\n");
 		exit(1);
 	}