From e89dc3aeaaa381fb67ce0fa69dce9f7f6fda05cd Mon Sep 17 00:00:00 2001 From: eadler Date: Wed, 30 Apr 2014 06:30:37 +0000 Subject: null.c: fix ordering Use a consistent ordering of full -> null -> zero (alphabetical) in null.c Reported by: mjg --- sys/dev/null/null.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c index 730f8dd..a95c4c4 100644 --- a/sys/dev/null/null.c +++ b/sys/dev/null/null.c @@ -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 */ -- cgit v1.1