From 72041f93af2022e4be25a1539d4577e2f9d2d08b Mon Sep 17 00:00:00 2001 From: Eric Allman Date: Mon, 1 Mar 1993 14:53:46 -0800 Subject: [PATCH] header file cleanup; primarily #include in sendmail.h and delete duplicate cruft SCCS-vsn: usr.sbin/sendmail/src/recipient.c 6.20 SCCS-vsn: usr.sbin/sendmail/src/main.c 6.31 SCCS-vsn: usr.sbin/sendmail/src/envelope.c 6.17 SCCS-vsn: usr.sbin/sendmail/src/arpadate.c 6.8 SCCS-vsn: usr.sbin/sendmail/src/savemail.c 6.17 SCCS-vsn: usr.sbin/sendmail/src/clock.c 6.3 SCCS-vsn: usr.sbin/sendmail/src/util.c 6.10 SCCS-vsn: usr.sbin/sendmail/src/readcf.c 6.15 SCCS-vsn: usr.sbin/sendmail/src/conf.c 6.30 SCCS-vsn: usr.sbin/sendmail/src/alias.c 6.20 --- usr/src/usr.sbin/sendmail/src/alias.c | 11 +++++------ usr/src/usr.sbin/sendmail/src/arpadate.c | 3 +-- usr/src/usr.sbin/sendmail/src/clock.c | 3 ++- usr/src/usr.sbin/sendmail/src/conf.c | 3 +-- usr/src/usr.sbin/sendmail/src/envelope.c | 5 ++--- usr/src/usr.sbin/sendmail/src/main.c | 3 +-- usr/src/usr.sbin/sendmail/src/readcf.c | 3 +-- usr/src/usr.sbin/sendmail/src/recipient.c | 5 ++--- usr/src/usr.sbin/sendmail/src/savemail.c | 3 +-- usr/src/usr.sbin/sendmail/src/util.c | 8 ++------ 10 files changed, 18 insertions(+), 29 deletions(-) diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c index 8838e489b7..517d9568b0 100644 --- a/usr/src/usr.sbin/sendmail/src/alias.c +++ b/usr/src/usr.sbin/sendmail/src/alias.c @@ -6,11 +6,10 @@ * %sccs.include.redist.c% */ -# include +# include "sendmail.h" # include # include # include -# include "sendmail.h" # include # include @@ -29,15 +28,15 @@ ERROR: DBM is no longer supported -- use NDBM instead. #ifndef lint #ifdef NEWDB #ifdef NDBM -static char sccsid[] = "@(#)alias.c 6.19 (Berkeley) %G% (with NEWDB and NDBM)"; +static char sccsid[] = "@(#)alias.c 6.20 (Berkeley) %G% (with NEWDB and NDBM)"; #else -static char sccsid[] = "@(#)alias.c 6.19 (Berkeley) %G% (with NEWDB)"; +static char sccsid[] = "@(#)alias.c 6.20 (Berkeley) %G% (with NEWDB)"; #endif #else #ifdef NDBM -static char sccsid[] = "@(#)alias.c 6.19 (Berkeley) %G% (with NDBM)"; +static char sccsid[] = "@(#)alias.c 6.20 (Berkeley) %G% (with NDBM)"; #else -static char sccsid[] = "@(#)alias.c 6.19 (Berkeley) %G% (without NEWDB or NDBM)"; +static char sccsid[] = "@(#)alias.c 6.20 (Berkeley) %G% (without NEWDB or NDBM)"; #endif #endif #endif /* not lint */ diff --git a/usr/src/usr.sbin/sendmail/src/arpadate.c b/usr/src/usr.sbin/sendmail/src/arpadate.c index b967882b00..5a783abd53 100644 --- a/usr/src/usr.sbin/sendmail/src/arpadate.c +++ b/usr/src/usr.sbin/sendmail/src/arpadate.c @@ -7,11 +7,10 @@ */ #ifndef lint -static char sccsid[] = "@(#)arpadate.c 6.7 (Berkeley) %G%"; +static char sccsid[] = "@(#)arpadate.c 6.8 (Berkeley) %G%"; #endif /* not lint */ # include "sendmail.h" -# include /* ** ARPADATE -- Create date in ARPANET format diff --git a/usr/src/usr.sbin/sendmail/src/clock.c b/usr/src/usr.sbin/sendmail/src/clock.c index eb8034398a..dba90cbeac 100644 --- a/usr/src/usr.sbin/sendmail/src/clock.c +++ b/usr/src/usr.sbin/sendmail/src/clock.c @@ -7,7 +7,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)clock.c 6.2 (Berkeley) %G%"; +static char sccsid[] = "@(#)clock.c 6.3 (Berkeley) %G%"; #endif /* not lint */ # include "sendmail.h" @@ -205,6 +205,7 @@ tick() static bool SleepDone; +unsigned int sleep(intvl) unsigned int intvl; { diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c index 4215ad40c9..6c9d3eaeb8 100644 --- a/usr/src/usr.sbin/sendmail/src/conf.c +++ b/usr/src/usr.sbin/sendmail/src/conf.c @@ -7,7 +7,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)conf.c 6.29 (Berkeley) %G%"; +static char sccsid[] = "@(#)conf.c 6.30 (Berkeley) %G%"; #endif /* not lint */ # include @@ -1037,7 +1037,6 @@ initgroups(name, basegid) #endif #if defined(HASUSTAT) -# include # include # include #endif diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c index d4386a5bb1..9b3fbafa86 100644 --- a/usr/src/usr.sbin/sendmail/src/envelope.c +++ b/usr/src/usr.sbin/sendmail/src/envelope.c @@ -7,15 +7,14 @@ */ #ifndef lint -static char sccsid[] = "@(#)envelope.c 6.16 (Berkeley) %G%"; +static char sccsid[] = "@(#)envelope.c 6.17 (Berkeley) %G%"; #endif /* not lint */ -#include +#include "sendmail.h" #include #include #include #include -#include "sendmail.h" /* ** NEWENVELOPE -- allocate a new envelope diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c index 8fef88912b..6330105e5c 100644 --- a/usr/src/usr.sbin/sendmail/src/main.c +++ b/usr/src/usr.sbin/sendmail/src/main.c @@ -13,12 +13,11 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)main.c 6.30 (Berkeley) %G%"; +static char sccsid[] = "@(#)main.c 6.31 (Berkeley) %G%"; #endif /* not lint */ #define _DEFINE -#include #include #include #include diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c index b9632332ad..a783a874b1 100644 --- a/usr/src/usr.sbin/sendmail/src/readcf.c +++ b/usr/src/usr.sbin/sendmail/src/readcf.c @@ -7,12 +7,11 @@ */ #ifndef lint -static char sccsid[] = "@(#)readcf.c 6.14 (Berkeley) %G%"; +static char sccsid[] = "@(#)readcf.c 6.15 (Berkeley) %G%"; #endif /* not lint */ # include "sendmail.h" # include -# include #ifdef NAMED_BIND # include # include diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c index 837387d948..f7318064a7 100644 --- a/usr/src/usr.sbin/sendmail/src/recipient.c +++ b/usr/src/usr.sbin/sendmail/src/recipient.c @@ -7,14 +7,13 @@ */ #ifndef lint -static char sccsid[] = "@(#)recipient.c 6.19 (Berkeley) %G%"; +static char sccsid[] = "@(#)recipient.c 6.20 (Berkeley) %G%"; #endif /* not lint */ -# include +# include "sendmail.h" # include # include # include -# include "sendmail.h" /* ** SENDTOLIST -- Designate a send list. diff --git a/usr/src/usr.sbin/sendmail/src/savemail.c b/usr/src/usr.sbin/sendmail/src/savemail.c index e0c3260939..56e11874e9 100644 --- a/usr/src/usr.sbin/sendmail/src/savemail.c +++ b/usr/src/usr.sbin/sendmail/src/savemail.c @@ -7,10 +7,9 @@ */ #ifndef lint -static char sccsid[] = "@(#)savemail.c 6.16 (Berkeley) %G%"; +static char sccsid[] = "@(#)savemail.c 6.17 (Berkeley) %G%"; #endif /* not lint */ -# include # include # include "sendmail.h" diff --git a/usr/src/usr.sbin/sendmail/src/util.c b/usr/src/usr.sbin/sendmail/src/util.c index 4ad7a66798..50717a4242 100644 --- a/usr/src/usr.sbin/sendmail/src/util.c +++ b/usr/src/usr.sbin/sendmail/src/util.c @@ -7,16 +7,12 @@ */ #ifndef lint -static char sccsid[] = "@(#)util.c 6.9 (Berkeley) %G%"; +static char sccsid[] = "@(#)util.c 6.10 (Berkeley) %G%"; #endif /* not lint */ -# include -# include -# include +# include "sendmail.h" # include # include -# include -# include "sendmail.h" # include "conf.h" /* ** STRIPQUOTES -- Strip quotes & quote bits from a string. -- 2.20.1