From owner-svn-src-projects@FreeBSD.ORG  Fri Sep  5 13:56:06 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7EEA6D64;
 Fri,  5 Sep 2014 13:56:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6AA021857;
 Fri,  5 Sep 2014 13:56:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s85Du6no027241;
 Fri, 5 Sep 2014 13:56:06 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s85Du66k027240;
 Fri, 5 Sep 2014 13:56:06 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201409051356.s85Du66k027240@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
 melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Fri, 5 Sep 2014 13:56:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r271165 - projects/ipfw/sbin/ipfw
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Sep 2014 13:56:06 -0000

Author: melifaro
Date: Fri Sep  5 13:56:05 2014
New Revision: 271165
URL: http://svnweb.freebsd.org/changeset/base/271165

Log:
  Return setsockopt() directly.
  
  Suggested by:	Steven Hartland  at killing@multiplay.co.uk.

Modified:
  projects/ipfw/sbin/ipfw/ipfw2.c

Modified: projects/ipfw/sbin/ipfw/ipfw2.c
==============================================================================
--- projects/ipfw/sbin/ipfw/ipfw2.c	Fri Sep  5 13:52:39 2014	(r271164)
+++ projects/ipfw/sbin/ipfw/ipfw2.c	Fri Sep  5 13:56:05 2014	(r271165)
@@ -575,7 +575,6 @@ do_cmd(int optname, void *optval, uintpt
 int
 do_set3(int optname, ip_fw3_opheader *op3, uintptr_t optlen)
 {
-	int error;
 
 	if (co.test_only)
 		return (0);
@@ -587,9 +586,7 @@ do_set3(int optname, ip_fw3_opheader *op
 
 	op3->opcode = optname;
 
-	error = setsockopt(ipfw_socket, IPPROTO_IP, IP_FW3, op3, optlen);
-
-	return (error);
+	return (setsockopt(ipfw_socket, IPPROTO_IP, IP_FW3, op3, optlen));
 }
 
 /*