From owner-svn-src-all@FreeBSD.ORG Tue Jul 30 19:02:08 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CF7CE643; Tue, 30 Jul 2013 19:02:08 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B6E8E2583; Tue, 30 Jul 2013 19:02:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r6UJ28AY058408; Tue, 30 Jul 2013 19:02:08 GMT (envelope-from obrien@freefall.freebsd.org) Received: (from obrien@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r6UJ288W058405; Tue, 30 Jul 2013 19:02:08 GMT (envelope-from obrien) Date: Tue, 30 Jul 2013 12:02:07 -0700 From: "David O'Brien" To: John Baldwin Subject: Re: svn commit: r253618 - head/sys/dev/usb/gadget Message-ID: <20130730190207.GC63635@dragon.NUXI.org> References: <201307241832.r6OIWFGc074918@svn.freebsd.org> <201307241529.35175.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201307241529.35175.jhb@freebsd.org> X-Operating-System: FreeBSD 10.0-CURRENT X-MUA-Host: dragon.NUXI.org X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? User-Agent: Mutt/1.5.20 (2009-06-14) 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 Reply-To: obrien@freebsd.org 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: Tue, 30 Jul 2013 19:02:08 -0000 On Wed, Jul 24, 2013 at 03:29:34PM -0400, John Baldwin wrote: > On Wednesday, July 24, 2013 2:32:15 pm David E. O'Brien wrote: > > per style(9): > > Kernel include files (i.e. sys/*.h) come first; normally, include > > OR , but not both. includes > > , and it is okay to depend on that. > > This is not fully correct. The consistent style throughout the tree when > using _FBSDID() is: > > #include > __FBSDID() > > #include > ... > > Please fix these to match that. It might not be a bad idea to document the > __FBSDID() practice in style.9 while you are at it. Hi John, As BDE mentioned, the text [still] says it is OK to depend on and including . I was one of the ones that put __FBSDID() in much of our code. I used a script to add the two lines: #include __FBSDID("$FreeBSD$"); I did it this way so as to not break the "but not both" rule for and . In otherwords my script wasn't smart enough to see if or was already being included and put the '__FBSDID("$FreeBSD$");' right below it. I don't feel #include __FBSDID("$FreeBSD$"); #include is against style(9). Should explicit language be added that one of , , or should be included first followed by '__FBSDID("$FreeBSD$");' (when used). Followed by all other headers. -- -- David (obrien@FreeBSD.org)