From owner-svn-src-all@FreeBSD.ORG Sat Aug 24 21:13:29 2013 Return-Path: Delivered-To: svn-src-all@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 ESMTP id 898014F8; Sat, 24 Aug 2013 21:13:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mail0.glenbarber.us (mail0.glenbarber.us [208.86.227.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C08D23C2; Sat, 24 Aug 2013 21:13:29 +0000 (UTC) Received: from glenbarber.us (unknown [IPv6:2001:470:8:1205:99cd:72d:5e87:427e]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by mail0.glenbarber.us (Postfix) with ESMTPSA id A09B526AD; Sat, 24 Aug 2013 21:13:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us A09B526AD Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Sat, 24 Aug 2013 17:13:25 -0400 From: Glen Barber To: Andre Oppermann Subject: Re: svn commit: r254779 - head/sys/kern Message-ID: <20130824211325.GA33782@glenbarber.us> References: <201308241224.r7OCOx9l069850@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Qxx1br4bt0+wmkIi" Content-Disposition: inline In-Reply-To: <201308241224.r7OCOx9l069850@svn.freebsd.org> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Aug 2013 21:13:29 -0000 --Qxx1br4bt0+wmkIi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Aug 24, 2013 at 12:24:59PM +0000, Andre Oppermann wrote: > Author: andre > Date: Sat Aug 24 12:24:58 2013 > New Revision: 254779 > URL: http://svnweb.freebsd.org/changeset/base/254779 >=20 > Log: > Avoid code duplication for mbuf initialization and use m_init() instead > in mb_ctor_mbuf() and mb_ctor_pack(). >=20 > Modified: > head/sys/kern/kern_mbuf.c >=20 > [...] > -#ifdef MAC > - /* If the label init fails, fail the alloc */ > - error =3D mac_mbuf_init(m, how); > - if (error) > - return (error); > -#endif > - } else > - m->m_data =3D m->m_dat; > - return (0); > + m =3D (struct mbuf *)mem; > + flags =3D args->flags; > + > + error =3D m_init(m, NULL, size, how, type, flags); > + > + return (error); > } > =20 This breaks head/. cc -c -O -pipe -std=3Dc99 -g -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/libfdt -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -funwind-tables -mllvm -arm-enable-ehabi -ffreestanding -Werror /src/sys/kern/kern_mbuf.c /src/sys/kern/kern_mbuf.c:637:2: error: use of undeclared identifier 'error' error =3D m_init(m, NULL, size, how, type, flags); ^ /src/sys/kern/kern_mbuf.c:643:10: error: use of undeclared identifier 'erro= r' return (error); ^=20 http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-armv6-arm.full Glen --Qxx1br4bt0+wmkIi Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQEcBAEBCAAGBQJSGSH1AAoJEFJPDDeguUaj1dwH/25PG6K7KQ1aIyEpYDbjKt+W 1z8fHkawnLFoOYhRe5Zs1ffmA/+HS6XfqWkS+cOrWfdKeMBunxgc973tx+jkMmWO slKMYqMPLQHcN4TeTSbMsYQ1fofCcweL5ZTB4O0GS4G6F18KQzCtopBn/XCLfxs0 AgnWvdg7ipD/r3aeTGoeGKOzPRv7E+WDsDfMIWAmzqLFi4Ci23IE4bqDR3OnFP86 2eOcOjd1gj1oe58BIUmeDsLW0zL2bFgCfcHa7rzMn5Y1kDk/KioUgQHTTAuxhhI+ FZBLJayMy8gxy1YI+T/WqRenVmNb1P6Skh20Ni+TOF2qrcxsV9sbxZ8lbNjgWbQ= =z9RW -----END PGP SIGNATURE----- --Qxx1br4bt0+wmkIi--