From owner-svn-src-head@FreeBSD.ORG  Sun Dec 18 20:41:58 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5F836106566C;
	Sun, 18 Dec 2011 20:41:58 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E63E8FC13;
	Sun, 18 Dec 2011 20:41:58 +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 pBIKfwGi024606;
	Sun, 18 Dec 2011 20:41:58 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBIKfwBs024603;
	Sun, 18 Dec 2011 20:41:58 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201112182041.pBIKfwBs024603@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 18 Dec 2011 20:41:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228696 - head/sbin/hastd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Dec 2011 20:41:58 -0000

Author: pjd
Date: Sun Dec 18 20:41:58 2011
New Revision: 228696
URL: http://svn.freebsd.org/changeset/base/228696

Log:
  Use lex's standard way of not generating unused function.
  
  Inspired by:	r228555
  MFC after:	1 week

Modified:
  head/sbin/hastd/Makefile
  head/sbin/hastd/token.l

Modified: head/sbin/hastd/Makefile
==============================================================================
--- head/sbin/hastd/Makefile	Sun Dec 18 20:40:19 2011	(r228695)
+++ head/sbin/hastd/Makefile	Sun Dec 18 20:41:58 2011	(r228696)
@@ -27,9 +27,6 @@ CFLAGS+=-DINET
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
-# This is needed to have WARNS > 1.
-CFLAGS+=-DYY_NO_UNPUT
-CFLAGS+=-DYY_NO_INPUT
 
 DPADD=	${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBL} ${LIBPTHREAD} ${LIBUTIL}
 LDADD=	-lgeom -lbsdxml -lsbuf -ll -lpthread -lutil

Modified: head/sbin/hastd/token.l
==============================================================================
--- head/sbin/hastd/token.l	Sun Dec 18 20:40:19 2011	(r228695)
+++ head/sbin/hastd/token.l	Sun Dec 18 20:41:58 2011	(r228696)
@@ -44,6 +44,9 @@ int lineno;
 #define	DP	do { } while (0)
 %}
 
+%option noinput
+%option nounput
+
 %%
 control			{ DP; return CONTROL; }
 pidfile			{ DP; return PIDFILE; }