svn commit: r286201 - head/usr.sbin/pw
Baptiste Daroussin
bapt at FreeBSD.org
Sun Aug 2 13:22:52 UTC 2015
Author: bapt
Date: Sun Aug 2 13:22:46 2015
New Revision: 286201
URL: https://svnweb.freebsd.org/changeset/base/286201
Log:
Cleanup a bit includes
Modified:
head/usr.sbin/pw/cpdir.c
head/usr.sbin/pw/grupd.c
head/usr.sbin/pw/psdate.c
head/usr.sbin/pw/pw.c
head/usr.sbin/pw/pw.h
head/usr.sbin/pw/pw_conf.c
head/usr.sbin/pw/pw_group.c
head/usr.sbin/pw/pw_log.c
head/usr.sbin/pw/pw_nis.c
head/usr.sbin/pw/pw_user.c
head/usr.sbin/pw/pw_utils.c
head/usr.sbin/pw/pwupd.c
Modified: head/usr.sbin/pw/cpdir.c
==============================================================================
--- head/usr.sbin/pw/cpdir.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/cpdir.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -29,17 +29,12 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
+#include <dirent.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
-#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <dirent.h>
#include "pw.h"
#include "pwupd.h"
Modified: head/usr.sbin/pw/grupd.c
==============================================================================
--- head/usr.sbin/pw/grupd.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/grupd.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -29,13 +29,11 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
+#include <err.h>
#include <grp.h>
#include <libutil.h>
-#include <err.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
#include "pwupd.h"
Modified: head/usr.sbin/pw/psdate.c
==============================================================================
--- head/usr.sbin/pw/psdate.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/psdate.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -29,12 +29,11 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
-#include <stdio.h>
+#include <ctype.h>
+#include <err.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <xlocale.h>
-#include <err.h>
#include "psdate.h"
Modified: head/usr.sbin/pw/pw.c
==============================================================================
--- head/usr.sbin/pw/pw.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/pw.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -32,9 +32,10 @@ static const char rcsid[] =
#include <err.h>
#include <fcntl.h>
#include <locale.h>
-#include <paths.h>
-#include <stdbool.h>
-#include <sys/wait.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
#include "pw.h"
const char *Modes[] = {
Modified: head/usr.sbin/pw/pw.h
==============================================================================
--- head/usr.sbin/pw/pw.h Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/pw.h Sun Aug 2 13:22:46 2015 (r286201)
@@ -26,23 +26,13 @@
* $FreeBSD$
*/
+#include <sys/stat.h>
+
#define _WITH_GETLINE
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/queue.h>
-#include <sysexits.h>
-#include "psdate.h"
#include "pwupd.h"
enum _mode
Modified: head/usr.sbin/pw/pw_conf.c
==============================================================================
--- head/usr.sbin/pw/pw_conf.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/pw_conf.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -31,11 +31,11 @@ static const char rcsid[] =
#include <sys/types.h>
#include <sys/sbuf.h>
-#include <inttypes.h>
-#include <string.h>
-#include <ctype.h>
-#include <fcntl.h>
+
#include <err.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
#include "pw.h"
Modified: head/usr.sbin/pw/pw_group.c
==============================================================================
--- head/usr.sbin/pw/pw_group.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/pw_group.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -32,10 +32,10 @@ static const char rcsid[] =
#include <ctype.h>
#include <err.h>
#include <grp.h>
-#include <inttypes.h>
#include <libutil.h>
#include <paths.h>
-#include <stdbool.h>
+#include <string.h>
+#include <sysexits.h>
#include <termios.h>
#include <unistd.h>
Modified: head/usr.sbin/pw/pw_log.c
==============================================================================
--- head/usr.sbin/pw/pw_log.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/pw_log.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -30,6 +30,8 @@ static const char rcsid[] =
#endif /* not lint */
#include <fcntl.h>
+#include <string.h>
+#include <stdarg.h>
#include "pw.h"
Modified: head/usr.sbin/pw/pw_nis.c
==============================================================================
--- head/usr.sbin/pw/pw_nis.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/pw_nis.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -30,6 +30,7 @@ static const char rcsid[] =
#endif /* not lint */
#include <sys/types.h>
+
#include <err.h>
#include <pwd.h>
#include <libutil.h>
Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/pw_user.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -30,23 +30,28 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
#include <ctype.h>
+#include <dirent.h>
#include <err.h>
#include <fcntl.h>
-#include <inttypes.h>
-#include <sys/param.h>
-#include <dirent.h>
-#include <paths.h>
-#include <termios.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <login_cap.h>
-#include <pwd.h>
#include <grp.h>
+#include <pwd.h>
#include <libutil.h>
+#include <login_cap.h>
+#include <paths.h>
+#include <string.h>
+#include <sysexits.h>
+#include <termios.h>
+#include <unistd.h>
+
#include "pw.h"
#include "bitmap.h"
+#include "psdate.h"
#define LOGNAMESIZE (MAXLOGNAME-1)
Modified: head/usr.sbin/pw/pw_utils.c
==============================================================================
--- head/usr.sbin/pw/pw_utils.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/pw_utils.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
#include <sysexits.h>
#include <limits.h>
#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include "pw.h"
Modified: head/usr.sbin/pw/pwupd.c
==============================================================================
--- head/usr.sbin/pw/pwupd.c Sun Aug 2 13:02:53 2015 (r286200)
+++ head/usr.sbin/pw/pwupd.c Sun Aug 2 13:22:46 2015 (r286201)
@@ -29,18 +29,16 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <pwd.h>
+#include <libutil.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <pwd.h>
-#include <libutil.h>
-#include <errno.h>
-#include <err.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/wait.h>
#include "pwupd.h"
More information about the svn-src-head
mailing list