Sun Feb 5 14:14:44 2012 UTC ()
Remove unneeded #include.


(dholland)
diff -r1.47 -r1.48 src/usr.bin/quota/quota.c
diff -r1.41 -r1.42 src/usr.sbin/repquota/repquota.c
cvs diff -r1.47 -r1.48 src/usr.bin/quota/quota.c (expand / switch to unified diff)

--- src/usr.bin/quota/quota.c 2012/02/01 17:48:10 1.47
+++ src/usr.bin/quota/quota.c 2012/02/05 14:14:44 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: quota.c,v 1.47 2012/02/01 17:48:10 dholland Exp $ */ 1/* $NetBSD: quota.c,v 1.48 2012/02/05 14:14:44 dholland Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1980, 1990, 1993 4 * Copyright (c) 1980, 1990, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Robert Elz at The University of Melbourne. 8 * Robert Elz at The University of Melbourne.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -32,27 +32,27 @@ @@ -32,27 +32,27 @@
32 * SUCH DAMAGE. 32 * SUCH DAMAGE.
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36#ifndef lint 36#ifndef lint
37__COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\ 37__COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\
38 The Regents of the University of California. All rights reserved."); 38 The Regents of the University of California. All rights reserved.");
39#endif /* not lint */ 39#endif /* not lint */
40 40
41#ifndef lint 41#ifndef lint
42#if 0 42#if 0
43static char sccsid[] = "@(#)quota.c 8.4 (Berkeley) 4/28/95"; 43static char sccsid[] = "@(#)quota.c 8.4 (Berkeley) 4/28/95";
44#else 44#else
45__RCSID("$NetBSD: quota.c,v 1.47 2012/02/01 17:48:10 dholland Exp $"); 45__RCSID("$NetBSD: quota.c,v 1.48 2012/02/05 14:14:44 dholland Exp $");
46#endif 46#endif
47#endif /* not lint */ 47#endif /* not lint */
48 48
49/* 49/*
50 * Disk quota reporting program. 50 * Disk quota reporting program.
51 */ 51 */
52#include <sys/param.h> 52#include <sys/param.h>
53#include <sys/types.h> 53#include <sys/types.h>
54#include <sys/file.h> 54#include <sys/file.h>
55#include <sys/stat.h> 55#include <sys/stat.h>
56#include <sys/mount.h> 56#include <sys/mount.h>
57#include <sys/socket.h> 57#include <sys/socket.h>
58 58
@@ -61,27 +61,26 @@ __RCSID("$NetBSD: quota.c,v 1.47 2012/02 @@ -61,27 +61,26 @@ __RCSID("$NetBSD: quota.c,v 1.47 2012/02
61#include <err.h> 61#include <err.h>
62#include <errno.h> 62#include <errno.h>
63#include <fstab.h> 63#include <fstab.h>
64#include <grp.h> 64#include <grp.h>
65#include <netdb.h> 65#include <netdb.h>
66#include <pwd.h> 66#include <pwd.h>
67#include <stdio.h> 67#include <stdio.h>
68#include <stdlib.h> 68#include <stdlib.h>
69#include <string.h> 69#include <string.h>
70#include <time.h> 70#include <time.h>
71#include <unistd.h> 71#include <unistd.h>
72 72
73#include <quota.h> 73#include <quota.h>
74#include <quota/quota.h> 
75 74
76#include "printquota.h" 75#include "printquota.h"
77 76
78struct quotause { 77struct quotause {
79 struct quotause *next; 78 struct quotause *next;
80 uid_t id; 79 uid_t id;
81 struct quotaval *qvs; 80 struct quotaval *qvs;
82 unsigned numqvs; 81 unsigned numqvs;
83 char fsname[MAXPATHLEN + 1]; 82 char fsname[MAXPATHLEN + 1];
84 struct quotahandle *qh; 83 struct quotahandle *qh;
85}; 84};
86 85
87static int anyusage(struct quotaval *, unsigned); 86static int anyusage(struct quotaval *, unsigned);
cvs diff -r1.41 -r1.42 src/usr.sbin/repquota/repquota.c (expand / switch to unified diff)

--- src/usr.sbin/repquota/repquota.c 2012/02/01 17:48:10 1.41
+++ src/usr.sbin/repquota/repquota.c 2012/02/05 14:14:44 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: repquota.c,v 1.41 2012/02/01 17:48:10 dholland Exp $ */ 1/* $NetBSD: repquota.c,v 1.42 2012/02/05 14:14:44 dholland Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1980, 1990, 1993 4 * Copyright (c) 1980, 1990, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Robert Elz at The University of Melbourne. 8 * Robert Elz at The University of Melbourne.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -32,49 +32,48 @@ @@ -32,49 +32,48 @@
32 * SUCH DAMAGE. 32 * SUCH DAMAGE.
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36#ifndef lint 36#ifndef lint
37__COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\ 37__COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\
38 The Regents of the University of California. All rights reserved."); 38 The Regents of the University of California. All rights reserved.");
39#endif /* not lint */ 39#endif /* not lint */
40 40
41#ifndef lint 41#ifndef lint
42#if 0 42#if 0
43static char sccsid[] = "@(#)repquota.c 8.2 (Berkeley) 11/22/94"; 43static char sccsid[] = "@(#)repquota.c 8.2 (Berkeley) 11/22/94";
44#else 44#else
45__RCSID("$NetBSD: repquota.c,v 1.41 2012/02/01 17:48:10 dholland Exp $"); 45__RCSID("$NetBSD: repquota.c,v 1.42 2012/02/05 14:14:44 dholland Exp $");
46#endif 46#endif
47#endif /* not lint */ 47#endif /* not lint */
48 48
49/* 49/*
50 * Quota report 50 * Quota report
51 */ 51 */
52#include <sys/param.h> 52#include <sys/param.h>
53#include <sys/stat.h> 53#include <sys/stat.h>
54#include <sys/types.h> 54#include <sys/types.h>
55#include <sys/statvfs.h> 55#include <sys/statvfs.h>
56 56
57#include <errno.h> 57#include <errno.h>
58#include <err.h> 58#include <err.h>
59#include <fstab.h> 59#include <fstab.h>
60#include <grp.h> 60#include <grp.h>
61#include <pwd.h> 61#include <pwd.h>
62#include <stdio.h> 62#include <stdio.h>
63#include <stdlib.h> 63#include <stdlib.h>
64#include <string.h> 64#include <string.h>
65#include <unistd.h> 65#include <unistd.h>
66 66
67#include <quota/quota.h> 
68#include <quota.h> 67#include <quota.h>
69 68
70#include "printquota.h" 69#include "printquota.h"
71 70
72/* 71/*
73 * XXX. Ideally we shouldn't compile either of these in, but it's a 72 * XXX. Ideally we shouldn't compile either of these in, but it's a
74 * nontrivial rework to avoid it and it'll work ok for now. 73 * nontrivial rework to avoid it and it'll work ok for now.
75 */ 74 */
76#define REPQUOTA_NUMIDTYPES 2 75#define REPQUOTA_NUMIDTYPES 2
77#define REPQUOTA_NUMOBJTYPES 2 76#define REPQUOTA_NUMOBJTYPES 2
78 77
79struct fileusage { 78struct fileusage {
80 struct fileusage *fu_next; 79 struct fileusage *fu_next;