From owner-svn-src-all@FreeBSD.ORG  Fri Aug 13 13:36:18 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 78A8E1065679;
	Fri, 13 Aug 2010 13:36:18 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 671988FC08;
	Fri, 13 Aug 2010 13:36:18 +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 o7DDaIFh015763;
	Fri, 13 Aug 2010 13:36:18 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7DDaISq015761;
	Fri, 13 Aug 2010 13:36:18 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201008131336.o7DDaISq015761@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Fri, 13 Aug 2010 13:36:18 +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: r211281 - head/bin/sh
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: Fri, 13 Aug 2010 13:36:18 -0000

Author: jilles
Date: Fri Aug 13 13:36:18 2010
New Revision: 211281
URL: http://svn.freebsd.org/changeset/base/211281

Log:
  sh: Fix shadowing of sigset.

Modified:
  head/bin/sh/error.c

Modified: head/bin/sh/error.c
==============================================================================
--- head/bin/sh/error.c	Fri Aug 13 12:56:00 2010	(r211280)
+++ head/bin/sh/error.c	Fri Aug 13 13:36:18 2010	(r211281)
@@ -102,7 +102,7 @@ exraise(int e)
 void
 onint(void)
 {
-	sigset_t sigset;
+	sigset_t sigs;
 
 	/*
 	 * The !in_dotrap here is safe.  The only way we can arrive here
@@ -115,8 +115,8 @@ onint(void)
 		return;
 	}
 	intpending = 0;
-	sigemptyset(&sigset);
-	sigprocmask(SIG_SETMASK, &sigset, NULL);
+	sigemptyset(&sigs);
+	sigprocmask(SIG_SETMASK, &sigs, NULL);
 
 	/*
 	 * This doesn't seem to be needed, since main() emits a newline.