From owner-svn-src-all@FreeBSD.ORG  Thu Mar  4 16:08:01 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9CD1610656C4;
	Thu,  4 Mar 2010 16:08:01 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D92B8FC08;
	Thu,  4 Mar 2010 16:08:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24G81Xg021543;
	Thu, 4 Mar 2010 16:08:01 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24G81FY021540;
	Thu, 4 Mar 2010 16:08:01 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201003041608.o24G81FY021540@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Thu, 4 Mar 2010 16:08:01 +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: r204711 - head/bin/ed
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Mar 2010 16:08:01 -0000

Author: uqs
Date: Thu Mar  4 16:08:01 2010
New Revision: 204711
URL: http://svn.freebsd.org/changeset/base/204711

Log:
  ed(1): make WARNS=6 clean
  
  Although argc and argv are never read after the longjmp is complete,
  gcc is not clever enough to see that and needlessly warns about it.
  So add volatile to silence the compiler.
  
  Approved by:	ed (the co-mentor, not ed(1))

Modified:
  head/bin/ed/Makefile
  head/bin/ed/main.c

Modified: head/bin/ed/Makefile
==============================================================================
--- head/bin/ed/Makefile	Thu Mar  4 16:07:14 2010	(r204710)
+++ head/bin/ed/Makefile	Thu Mar  4 16:08:01 2010	(r204711)
@@ -4,7 +4,6 @@
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
-WARNS?=	2
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 

Modified: head/bin/ed/main.c
==============================================================================
--- head/bin/ed/main.c	Thu Mar  4 16:07:14 2010	(r204710)
+++ head/bin/ed/main.c	Thu Mar  4 16:08:01 2010	(r204711)
@@ -103,15 +103,10 @@ const char usage[] = "usage: %s [-] [-sx
 
 /* ed: line editor */
 int
-main(int argc, char *argv[])
+main(volatile int argc, char ** volatile argv)
 {
 	int c, n;
 	long status = 0;
-#if __GNUC__
-	/* Avoid longjmp clobbering */
-	(void) &argc;
-	(void) &argv;
-#endif
 
 	(void)setlocale(LC_ALL, "");