Thu Dec 2 18:02:58 2010 UTC ()
Remove a line that was intended only for my personal testing and that
breaks things.


(elric)
diff -r1.30 -r1.31 src/sbin/cgdconfig/cgdconfig.c
cvs diff -r1.30 -r1.31 src/sbin/cgdconfig/cgdconfig.c (expand / switch to unified diff)

--- src/sbin/cgdconfig/cgdconfig.c 2010/12/02 04:54:32 1.30
+++ src/sbin/cgdconfig/cgdconfig.c 2010/12/02 18:02:58 1.31
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1#define opendisk1(x,y,z,t,u,v) opendisk(x,y,z,t,u) 1/* $NetBSD: cgdconfig.c,v 1.31 2010/12/02 18:02:58 elric Exp $ */
2 
3/* $NetBSD: cgdconfig.c,v 1.30 2010/12/02 04:54:32 elric Exp $ */ 
4 2
5/*- 3/*-
6 * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. 4 * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
7 * All rights reserved. 5 * All rights reserved.
8 * 6 *
9 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
10 * by Roland C. Dowdeswell. 8 * by Roland C. Dowdeswell.
11 * 9 *
12 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
14 * are met: 12 * are met:
15 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
16 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -25,27 +23,27 @@ @@ -25,27 +23,27 @@
25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
32 */ 30 */
33 31
34#include <sys/cdefs.h> 32#include <sys/cdefs.h>
35#ifndef lint 33#ifndef lint
36__COPYRIGHT("@(#) Copyright (c) 2002, 2003\ 34__COPYRIGHT("@(#) Copyright (c) 2002, 2003\
37 The NetBSD Foundation, Inc. All rights reserved."); 35 The NetBSD Foundation, Inc. All rights reserved.");
38__RCSID("$NetBSD: cgdconfig.c,v 1.30 2010/12/02 04:54:32 elric Exp $"); 36__RCSID("$NetBSD: cgdconfig.c,v 1.31 2010/12/02 18:02:58 elric Exp $");
39#endif 37#endif
40 38
41#include <err.h> 39#include <err.h>
42#include <errno.h> 40#include <errno.h>
43#include <fcntl.h> 41#include <fcntl.h>
44#include <libgen.h> 42#include <libgen.h>
45#include <stdio.h> 43#include <stdio.h>
46#include <stdlib.h> 44#include <stdlib.h>
47#include <string.h> 45#include <string.h>
48#include <unistd.h> 46#include <unistd.h>
49#include <util.h> 47#include <util.h>
50 48
51#include <sys/ioctl.h> 49#include <sys/ioctl.h>