From owner-svn-src-all@FreeBSD.ORG  Thu May  9 04:41:04 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1EC9556D;
 Thu,  9 May 2013 04:41:04 +0000 (UTC)
 (envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 10D681CF5;
 Thu,  9 May 2013 04:41:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r494f3uV095826;
 Thu, 9 May 2013 04:41:03 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r494f3Cv095825;
 Thu, 9 May 2013 04:41:03 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201305090441.r494f3Cv095825@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Thu, 9 May 2013 04:41:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250402 - head/lib/libthr/thread
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 09 May 2013 04:41:04 -0000

Author: davidxu
Date: Thu May  9 04:41:03 2013
New Revision: 250402
URL: http://svnweb.freebsd.org/changeset/base/250402

Log:
  Fix return value for setcontext and swapcontext.

Modified:
  head/lib/libthr/thread/thr_sig.c

Modified: head/lib/libthr/thread/thr_sig.c
==============================================================================
--- head/lib/libthr/thread/thr_sig.c	Thu May  9 02:23:02 2013	(r250401)
+++ head/lib/libthr/thread/thr_sig.c	Thu May  9 04:41:03 2013	(r250402)
@@ -725,8 +725,10 @@ _setcontext(const ucontext_t *ucp)
 {
 	ucontext_t uc;
 
-	if (ucp == NULL)
-		return (EINVAL);
+	if (ucp == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
 	if (!SIGISMEMBER(uc.uc_sigmask, SIGCANCEL))
 		return __sys_setcontext(ucp);
 	(void) memcpy(&uc, ucp, sizeof(uc));
@@ -740,8 +742,10 @@ _swapcontext(ucontext_t *oucp, const uco
 {
 	ucontext_t uc;
 
-	if (oucp == NULL || ucp == NULL)
-		return (EINVAL);
+	if (oucp == NULL || ucp == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
 	if (SIGISMEMBER(ucp->uc_sigmask, SIGCANCEL)) {
 		(void) memcpy(&uc, ucp, sizeof(uc));
 		SIGDELSET(uc.uc_sigmask, SIGCANCEL);