From 007d33500e91b61271d9374c5994f1bdf89b0890 Mon Sep 17 00:00:00 2001 From: Eivind Eklund Date: Wed, 10 Dec 1997 22:18:54 +0000 Subject: [PATCH] Remove simultaneous include of and . Reorder includes to be alphabetical some places since I already was in here. --- bin/csh/csh.c | 5 ++--- bin/csh/exec.c | 3 +-- bin/ed/ed.h | 3 +-- bin/pax/ar_io.c | 4 +--- bin/pax/ar_subs.c | 3 +-- bin/pax/buf_subs.c | 5 +---- bin/pax/cache.c | 4 +--- bin/pax/cpio.c | 3 +-- bin/pax/file_subs.c | 3 +-- bin/pax/ftree.c | 3 +-- bin/pax/gen_subs.c | 3 +-- bin/pax/options.c | 4 +--- bin/pax/pat_rep.c | 4 +--- bin/pax/pax.c | 11 +++++------ bin/pax/sel_subs.c | 3 +-- bin/pax/tables.c | 7 +++---- bin/pax/tar.c | 3 +-- bin/pax/tty_subs.c | 5 +---- bin/sh/jobs.c | 3 +-- bin/test/test.c | 5 ++--- 20 files changed, 28 insertions(+), 56 deletions(-) diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 91f1ecabac8..3504806cc59 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -42,14 +42,13 @@ static const char copyright[] = static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93"; #else static const char rcsid[] = - "$Id: csh.c,v 1.10 1997/08/08 00:49:25 steve Exp $"; + "$Id: csh.c,v 1.11 1997/10/07 16:27:48 eivind Exp $"; #endif #endif /* not lint */ -#include +#include #include #include -#include #include #include #include diff --git a/bin/csh/exec.c b/bin/csh/exec.c index 1815eae854a..cee1cbc9008 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -36,11 +36,10 @@ static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 5/31/93"; #else static const char rcsid[] = - "$Id: exec.c,v 1.6 1997/02/22 14:01:50 peter Exp $"; + "$Id: exec.c,v 1.7 1997/08/07 21:42:07 steve Exp $"; #endif #endif /* not lint */ -#include #include #include #include diff --git a/bin/ed/ed.h b/bin/ed/ed.h index 8066cd7340a..1e77b38d671 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -25,10 +25,9 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $Id$ + * $Id: ed.h,v 1.10 1997/02/22 14:03:14 peter Exp $ */ -#include #include /* for MAXPATHLEN */ #include #if defined(sun) || defined(__NetBSD__) diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 8cb5a3b513d..d1f955f4a59 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ar_io.c,v 1.7 1997/02/22 14:04:17 peter Exp $ + * $Id: ar_io.c,v 1.8 1997/08/29 16:12:19 sos Exp $ */ #ifndef lint @@ -42,11 +42,9 @@ static char const sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94"; #endif /* not lint */ #include -#include #include #include #include -#include #include #include #include diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index 6e4ecf5202f..a3be1c988b1 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ar_subs.c,v 1.7 1997/02/22 14:04:19 peter Exp $ + * $Id: ar_subs.c,v 1.8 1997/08/29 16:12:19 sos Exp $ */ #ifndef lint @@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94"; #include #include #include -#include #include #include #include diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c index 6a579c51106..335bc1ff13d 100644 --- a/bin/pax/buf_subs.c +++ b/bin/pax/buf_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: buf_subs.c,v 1.7 1997/02/22 14:04:20 peter Exp $ + * $Id: buf_subs.c,v 1.8 1997/08/29 16:12:20 sos Exp $ */ #ifndef lint @@ -42,10 +42,7 @@ static char const sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94"; #endif /* not lint */ #include -#include #include -#include -#include #include #include #include diff --git a/bin/pax/cache.c b/bin/pax/cache.c index 56f59f10920..b2a23e16241 100644 --- a/bin/pax/cache.c +++ b/bin/pax/cache.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cache.c,v 1.7 1997/06/02 06:30:06 charnier Exp $ + * $Id: cache.c,v 1.8 1997/08/29 16:12:21 sos Exp $ */ #ifndef lint @@ -42,9 +42,7 @@ static char const sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93"; #endif /* not lint */ #include -#include #include -#include #include #include #include diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index 23bbc78b3b2..c1e43cfab34 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpio.c,v 1.7 1997/02/22 14:04:23 peter Exp $ + * $Id: cpio.c,v 1.8 1997/08/29 16:12:21 sos Exp $ */ #ifndef lint @@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93"; #include #include #include -#include #include #include #include diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index f4bcee270df..baabde9f2e6 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: file_subs.c,v 1.7 1997/02/22 14:04:26 peter Exp $ + * $Id: file_subs.c,v 1.8 1997/08/29 16:12:23 sos Exp $ */ #ifndef lint @@ -45,7 +45,6 @@ static char const sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93"; #include #include #include -#include #include #include #include diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index 00dce376e66..e2db74d40bd 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ftree.c,v 1.7 1997/02/22 14:04:27 peter Exp $ + * $Id: ftree.c,v 1.8 1997/08/29 16:12:24 sos Exp $ */ #ifndef lint @@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94"; #include #include #include -#include #include #include #include diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c index bf6a40472b5..4777a194890 100644 --- a/bin/pax/gen_subs.c +++ b/bin/pax/gen_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: gen_subs.c,v 1.9 1997/02/22 14:04:31 peter Exp $ */ #ifndef lint @@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93"; #include #include #include -#include #include #include #include diff --git a/bin/pax/options.c b/bin/pax/options.c index ef0b1c77789..66fc3e3266d 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: options.c,v 1.8 1997/03/28 15:24:27 imp Exp $ + * $Id: options.c,v 1.9 1997/08/29 16:12:27 sos Exp $ */ #ifndef lint @@ -42,10 +42,8 @@ static char const sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #endif /* not lint */ #include -#include #include #include -#include #include #include #include diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index 2933e1f1c1e..800162bb5a7 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pat_rep.c,v 1.9 1997/06/02 06:30:06 charnier Exp $ + * $Id: pat_rep.c,v 1.10 1997/08/29 16:12:27 sos Exp $ */ #ifndef lint @@ -42,9 +42,7 @@ static char const sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94"; #endif /* not lint */ #include -#include #include -#include #include #include #include diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 7199f958d5c..6bb34bee9cf 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pax.c,v 1.8 1997/02/22 14:04:39 peter Exp $ + * $Id: pax.c,v 1.9 1997/08/29 16:12:28 sos Exp $ */ #ifndef lint @@ -47,17 +47,16 @@ static char const copyright[] = static char const sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; #endif /* not lint */ -#include #include -#include #include #include #include -#include -#include -#include #include #include +#include +#include +#include +#include #include "pax.h" #include "extern.h" static int gen_init __P((void)); diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index b740aed9434..47aca3d2d7c 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sel_subs.c,v 1.6 1997/02/22 14:04:41 peter Exp $ + * $Id: sel_subs.c,v 1.7 1997/08/29 16:12:29 sos Exp $ */ #ifndef lint @@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93"; #include #include #include -#include #include #include #include diff --git a/bin/pax/tables.c b/bin/pax/tables.c index 619b5e96291..87da13b981f 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tables.c,v 1.8 1997/06/02 06:30:06 charnier Exp $ + * $Id: tables.c,v 1.9 1997/08/29 16:12:29 sos Exp $ */ #ifndef lint @@ -44,13 +44,12 @@ static char const sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93"; #include #include #include -#include #include +#include #include +#include #include #include -#include -#include #include "pax.h" #include "tables.h" #include "extern.h" diff --git a/bin/pax/tar.c b/bin/pax/tar.c index c528da9c1a0..c16cdb99f3c 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tar.c,v 1.7 1997/02/22 14:04:45 peter Exp $ + * $Id: tar.c,v 1.8 1997/08/29 16:12:30 sos Exp $ */ #ifndef lint @@ -44,7 +44,6 @@ static char const sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #include #include #include -#include #include #include #include diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c index 51272acdab9..afeb1f2e45c 100644 --- a/bin/pax/tty_subs.c +++ b/bin/pax/tty_subs.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tty_subs.c,v 1.6 1997/02/22 14:04:47 peter Exp $ + * $Id: tty_subs.c,v 1.7 1997/08/29 16:12:30 sos Exp $ */ #ifndef lint @@ -42,12 +42,9 @@ static char const sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94"; #endif /* not lint */ #include -#include #include -#include #include #include -#include #include #include #include diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 563892f402e..a17b5d0fcff 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: jobs.c,v 1.15 1997/05/24 21:04:55 steve Exp $ + * $Id: jobs.c,v 1.16 1997/08/18 02:53:19 steve Exp $ */ #ifndef lint @@ -45,7 +45,6 @@ static char const sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95"; #include #include #include -#include #include #ifdef BSD #include diff --git a/bin/test/test.c b/bin/test/test.c index 59ccf33895a..d74b299d581 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: test.c,v 1.17 1997/02/22 14:06:25 peter Exp $ */ #ifndef lint @@ -46,9 +46,8 @@ static char const copyright[] = static char const sccsid[] = "@(#)test.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ -#include -#include #include +#include #include #include