From owner-svn-src-head@FreeBSD.ORG Wed Apr 30 06:30:37 2014 Return-Path: Delivered-To: svn-src-head@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 AE7ADF2E; Wed, 30 Apr 2014 06:30:37 +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 9B7A714E2; Wed, 30 Apr 2014 06:30:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3U6UbQ2078259; Wed, 30 Apr 2014 06:30:37 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3U6UbTB078258; Wed, 30 Apr 2014 06:30:37 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201404300630.s3U6UbTB078258@svn.freebsd.org> From: Eitan Adler Date: Wed, 30 Apr 2014 06:30:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265134 - head/sys/dev/null X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Apr 2014 06:30:37 -0000 Author: eadler Date: Wed Apr 30 06:30:37 2014 New Revision: 265134 URL: http://svnweb.freebsd.org/changeset/base/265134 Log: null.c: fix ordering Use a consistent ordering of full -> null -> zero (alphabetical) in null.c Reported by: mjg Modified: head/sys/dev/null/null.c Modified: head/sys/dev/null/null.c ============================================================================== --- head/sys/dev/null/null.c Wed Apr 30 06:27:23 2014 (r265133) +++ head/sys/dev/null/null.c Wed Apr 30 06:30:37 2014 (r265134) @@ -46,9 +46,9 @@ __FBSDID("$FreeBSD$"); #include /* For use with destroy_dev(9). */ +static struct cdev *full_dev; static struct cdev *null_dev; static struct cdev *zero_dev; -static struct cdev *full_dev; static d_write_t full_write; static d_write_t null_write; @@ -56,6 +56,14 @@ static d_ioctl_t null_ioctl; static d_ioctl_t zero_ioctl; static d_read_t zero_read; +static struct cdevsw full_cdevsw = { + .d_version = D_VERSION, + .d_read = zero_read, + .d_write = full_write, + .d_ioctl = zero_ioctl, + .d_name = "full", +}; + static struct cdevsw null_cdevsw = { .d_version = D_VERSION, .d_read = (d_read_t *)nullop, @@ -73,13 +81,6 @@ static struct cdevsw zero_cdevsw = { .d_flags = D_MMAP_ANON, }; -static struct cdevsw full_cdevsw = { - .d_version = D_VERSION, - .d_read = zero_read, - .d_write = full_write, - .d_ioctl = zero_ioctl, - .d_name = "full", -}; /* ARGSUSED */