From zeising@daemonic.se  Tue May  1 10:53:03 2012
Return-Path: <zeising@daemonic.se>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20B88106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2012 10:53:03 +0000 (UTC)
	(envelope-from zeising@daemonic.se)
Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3])
	by mx1.freebsd.org (Postfix) with ESMTP id BA0228FC19
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2012 10:53:02 +0000 (UTC)
Received: from mail.lysator.liu.se (localhost [127.0.0.1])
	by mail.lysator.liu.se (Postfix) with ESMTP id 135CA40002
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2012 12:53:02 +0200 (CEST)
Received: by mail.lysator.liu.se (Postfix, from userid 1004)
	id 08E0040003; Tue,  1 May 2012 12:53:02 +0200 (CEST)
Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.lysator.liu.se (Postfix) with ESMTPSA id 6D12D40002
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2012 12:53:01 +0200 (CEST)
Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6])
	by mx.daemonic.se (Postfix) with ESMTPS id 3Vhfbd1DB4z8ggx
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2012 12:53:01 +0200 (CEST)
Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with cipher CAMELLIA256-SHA)
	by mailscanner.daemonic.se (mailscanner.daemonic.se [2001:470:dca9:0:1::6]) (amavisd-new, port 10025)
	with ESMTPS id kc8w2vJjAhKK for <FreeBSD-gnats-submit@freebsd.org>;
	Tue,  1 May 2012 12:52:59 +0200 (CEST)
Received: from mail.daemonic.se (mail.daemonic.se [10.1.0.4])
	by mx.daemonic.se (Postfix) with ESMTPS id 3Vhfbb0PQVz8ggv
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2012 12:52:59 +0200 (CEST)
Received: from vincent.daemonic.se (login.daemonic.se [IPv6:2001:470:dca9:0:1::10])
	by mail.daemonic.se (Postfix) with ESMTPS id 3Vhfbb05VSz9Ctj
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2012 12:52:59 +0200 (CEST)
Received: (from zeising@localhost)
	by vincent.daemonic.se (8.14.5/8.14.5/Submit) id q41Aqw43068449;
	Tue, 1 May 2012 12:52:58 +0200 (CEST)
	(envelope-from zeising)
Message-Id: <201205011052.q41Aqw43068449@vincent.daemonic.se>
Date: Tue, 1 May 2012 12:52:58 +0200 (CEST)
From: Niclas Zeising <zeising@daemonic.se>
Reply-To: Niclas Zeising <zeising@daemonic.se>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] language fixes to usr.bin/mkesdb and usr.bin/mkcsmapper
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         167480
>Category:       bin
>Synopsis:       [PATCH] language fixes to gmkesdb(1) and gmkcsmapper(1)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 01 11:00:23 UTC 2012
>Closed-Date:    Wed Sep 05 16:23:04 UTC 2012
>Last-Modified:  Sat Sep 15 19:00:23 UTC 2012
>Originator:     Niclas Zeising
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD vincent.daemonic.se 9.0-RELEASE FreeBSD 9.0-RELEASE #0 r232364: Fri Mar 2 01:14:23 CET 2012 root@vincent.daemonic.se:/usr/obj/usr/src/sys/VINCENT amd64


	
>Description:
	The error message in the lex scanner in usr.bin/mkesdb and usr.bin/mkcsmapper could be improved language wise.
>How-To-Repeat:
	
>Fix:

	Attached patch improves the language.

--- head.usr.bin.spellfix.diff begins here ---
Index: head/usr.bin/mkesdb/lex.l
===================================================================
--- head/usr.bin/mkesdb/lex.l	(revision 234868)
+++ head/usr.bin/mkesdb/lex.l	(working copy)
@@ -59,7 +60,7 @@
 <COMMENT>[\n]	{ line_number++; }
 <COMMENT>.	{ }
 <COMMENT><<EOF>>	{
-		yyerror("unexpected file end (unterminate comment)\n");
+		yyerror("unexpected end of file (unterminated comment)\n");
 		exit(1);
 	}
 
Index: head/usr.bin/mkcsmapper/lex.l
===================================================================
--- head/usr.bin/mkcsmapper/lex.l	(revision 234868)
+++ head/usr.bin/mkcsmapper/lex.l	(working copy)
 <COMMENT>[\n]	{ line_number++; }
 <COMMENT>.	{ }
 <COMMENT><<EOF>>	{
-		yyerror("unexpected file end (unterminate comment)\n");
+		yyerror("unexpected end of file (unterminated comment)\n");
 		exit(1);
 	}
 
--- head.usr.bin.spellfix.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Sun May 6 14:43:44 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167480 
State-Changed-From-To: open->analyzed 
State-Changed-By: eadler 
State-Changed-When: Tue May 8 16:04:27 UTC 2012 
State-Changed-Why:  
awaiting approval 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167480 
State-Changed-From-To: analyzed->open 
State-Changed-By: eadler 
State-Changed-When: Fri Jun 1 07:04:20 UTC 2012 
State-Changed-Why:  
Note to self: Resend this as a spell fix only 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167480 
State-Changed-From-To: open->analyzed 
State-Changed-By: eadler 
State-Changed-When: Wed Jul 4 02:08:10 UTC 2012 
State-Changed-Why:  
dup of bin/167481 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167480 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/167480: commit references a PR
Date: Sat,  7 Jul 2012 17:06:06 +0000 (UTC)

 Author: eadler
 Date: Sat Jul  7 17:05:55 2012
 New Revision: 238197
 URL: http://svn.freebsd.org/changeset/base/238197
 
 Log:
   Fix spelling
   
   PR:		bin/167480
   Submitted by:	zeising
   Approved by:	cperciva
 
 Modified:
   head/usr.bin/mkcsmapper/lex.l
   head/usr.bin/mkesdb/lex.l
 
 Modified: head/usr.bin/mkcsmapper/lex.l
 ==============================================================================
 --- head/usr.bin/mkcsmapper/lex.l	Sat Jul  7 16:09:53 2012	(r238196)
 +++ head/usr.bin/mkcsmapper/lex.l	Sat Jul  7 17:05:55 2012	(r238197)
 @@ -57,7 +57,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: head/usr.bin/mkesdb/lex.l
 ==============================================================================
 --- head/usr.bin/mkesdb/lex.l	Sat Jul  7 16:09:53 2012	(r238196)
 +++ head/usr.bin/mkesdb/lex.l	Sat Jul  7 17:05:55 2012	(r238197)
 @@ -59,7 +59,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);
  	}
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: analyzed->patched 
State-Changed-By: eadler 
State-Changed-When: Sat Jul 7 17:33:07 UTC 2012 
State-Changed-Why:  
patched in r238197 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167480 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Wed Sep 5 16:23:01 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=167480 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/167480: commit references a PR
Date: Sat, 15 Sep 2012 18:53:20 +0000 (UTC)

 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);
  	}
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
