From owner-svn-src-stable-8@FreeBSD.ORG Thu Apr 21 08:15:30 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AE11106566B; Thu, 21 Apr 2011 08:15:30 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 09B7E8FC19; Thu, 21 Apr 2011 08:15:30 +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 p3L8FT8I086819; Thu, 21 Apr 2011 08:15:29 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3L8FTI6086817; Thu, 21 Apr 2011 08:15:29 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201104210815.p3L8FTI6086817@svn.freebsd.org> From: Gleb Smirnoff Date: Thu, 21 Apr 2011 08:15:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220913 - stable/8/sys/netgraph X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2011 08:15:30 -0000 Author: glebius Date: Thu Apr 21 08:15:29 2011 New Revision: 220913 URL: http://svn.freebsd.org/changeset/base/220913 Log: Merge from head/ 220745: Fix error where error variable was assigned result of comparison, instead of function return value. Submitted by: Przemyslaw Frasunek Modified: stable/8/sys/netgraph/ng_base.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/netgraph/ng_base.c ============================================================================== --- stable/8/sys/netgraph/ng_base.c Thu Apr 21 08:13:44 2011 (r220912) +++ stable/8/sys/netgraph/ng_base.c Thu Apr 21 08:15:29 2011 (r220913) @@ -596,7 +596,7 @@ ng_make_node(const char *typename, node_ */ if (type->constructor != NULL) { if ((error = ng_make_node_common(type, nodepp)) == 0) { - if ((error = ((*type->constructor)(*nodepp)) != 0)) { + if ((error = ((*type->constructor)(*nodepp))) != 0) { NG_NODE_UNREF(*nodepp); } }