diff options
408 files changed, 970 insertions, 795 deletions
diff --git a/lib/libc/amd64/gen/frexp.c b/lib/libc/amd64/gen/frexp.c index 0882b72..25baeca 100644 --- a/lib/libc/amd64/gen/frexp.c +++ b/lib/libc/amd64/gen/frexp.c @@ -31,10 +31,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <math.h> diff --git a/lib/libc/amd64/gen/infinity.c b/lib/libc/amd64/gen/infinity.c index ac92d46..966a06e 100644 --- a/lib/libc/amd64/gen/infinity.c +++ b/lib/libc/amd64/gen/infinity.c @@ -1,8 +1,10 @@ /* * infinity.c - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <math.h> /* bytes for +Infinity on a 387 */ diff --git a/lib/libc/amd64/gen/isinf.c b/lib/libc/amd64/gen/isinf.c index 8a34d4b..4c49f9a 100644 --- a/lib/libc/amd64/gen/isinf.c +++ b/lib/libc/amd64/gen/isinf.c @@ -31,10 +31,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/amd64/gen/ldexp.c b/lib/libc/amd64/gen/ldexp.c index 3ee9e090..bb82b14 100644 --- a/lib/libc/amd64/gen/ldexp.c +++ b/lib/libc/amd64/gen/ldexp.c @@ -34,10 +34,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * ldexp(value, exp): return value * (2 ** exp). diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c index 88a3c5f..0030e50 100644 --- a/lib/libc/compat-43/creat.c +++ b/lib/libc/compat-43/creat.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)creat.c 8.1 (Berkeley) 6/2/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <fcntl.h> diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c index c4caff6..0652230 100644 --- a/lib/libc/compat-43/gethostid.c +++ b/lib/libc/compat-43/gethostid.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostid.c 8.1 (Berkeley) 6/2/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/sysctl.h> diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c index 9f0e633..668dae0 100644 --- a/lib/libc/compat-43/getwd.c +++ b/lib/libc/compat-43/getwd.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getwd.c 8.1 (Berkeley) 6/2/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <unistd.h> diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c index ac3ba6e..2ab3c3b 100644 --- a/lib/libc/compat-43/killpg.c +++ b/lib/libc/compat-43/killpg.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)killpg.c 8.1 (Berkeley) 6/2/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <signal.h> diff --git a/lib/libc/compat-43/sethostid.c b/lib/libc/compat-43/sethostid.c index 8122c81..1cb73b2 100644 --- a/lib/libc/compat-43/sethostid.c +++ b/lib/libc/compat-43/sethostid.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)sethostid.c 8.1 (Berkeley) 6/2/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/sysctl.h> diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c index dc0dd3f..cf0c08e 100644 --- a/lib/libc/compat-43/setpgrp.c +++ b/lib/libc/compat-43/setpgrp.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setpgrp.c 8.1 (Berkeley) 6/2/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <unistd.h> diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c index 1d86642..4b6d751 100644 --- a/lib/libc/compat-43/setrgid.c +++ b/lib/libc/compat-43/setrgid.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setrgid.c 8.1 (Berkeley) 6/2/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <unistd.h> diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c index 1551abb..37b2b5b 100644 --- a/lib/libc/compat-43/setruid.c +++ b/lib/libc/compat-43/setruid.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setruid.c 8.1 (Berkeley) 6/2/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <unistd.h> diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c index 4dae592..67a7412 100644 --- a/lib/libc/compat-43/sigcompat.c +++ b/lib/libc/compat-43/sigcompat.c @@ -32,12 +32,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)sigcompat.c 8.1 (Berkeley) 6/2/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/param.h> diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c index e8bb11c..3bdb505 100644 --- a/lib/libc/db/btree/bt_close.c +++ b/lib/libc/db/btree/bt_close.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bt_close.c 8.7 (Berkeley) 8/17/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/param.h> diff --git a/lib/libc/db/btree/bt_debug.c b/lib/libc/db/btree/bt_debug.c index 3aefbe7..11ed3d8 100644 --- a/lib/libc/db/btree/bt_debug.c +++ b/lib/libc/db/btree/bt_debug.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/lib/libc/db/btree/bt_get.c b/lib/libc/db/btree/bt_get.c index 74824c7..1911731 100644 --- a/lib/libc/db/btree/bt_get.c +++ b/lib/libc/db/btree/bt_get.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bt_get.c 8.6 (Berkeley) 7/20/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c index 20cce2d..40b00a5 100644 --- a/lib/libc/db/btree/bt_open.c +++ b/lib/libc/db/btree/bt_open.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bt_open.c 8.10 (Berkeley) 8/17/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Implementation of btree access method for 4.4BSD. diff --git a/lib/libc/db/btree/bt_overflow.c b/lib/libc/db/btree/bt_overflow.c index db28a22..7f479f5 100644 --- a/lib/libc/db/btree/bt_overflow.c +++ b/lib/libc/db/btree/bt_overflow.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bt_overflow.c 8.5 (Berkeley) 7/16/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/lib/libc/db/btree/bt_page.c b/lib/libc/db/btree/bt_page.c index ce9cbf1..105ffa5 100644 --- a/lib/libc/db/btree/bt_page.c +++ b/lib/libc/db/btree/bt_page.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bt_page.c 8.3 (Berkeley) 7/14/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/db/db/db.c b/lib/libc/db/db/db.c index a18f056..830f581 100644 --- a/lib/libc/db/db/db.c +++ b/lib/libc/db/db/db.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c index 2e8165d..b1d825d 100644 --- a/lib/libc/db/hash/ndbm.c +++ b/lib/libc/db/hash/ndbm.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ndbm.c 8.4 (Berkeley) 7/21/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * This package provides a dbm compatible interface to the new hashing diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c index 63a9947..698fa8a 100644 --- a/lib/libc/db/mpool/mpool.c +++ b/lib/libc/db/mpool/mpool.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/param.h> diff --git a/lib/libc/db/recno/rec_close.c b/lib/libc/db/recno/rec_close.c index 1f19bd3..2246c5b 100644 --- a/lib/libc/db/recno/rec_close.c +++ b/lib/libc/db/recno/rec_close.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rec_close.c 8.6 (Berkeley) 8/18/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/db/recno/rec_get.c b/lib/libc/db/recno/rec_get.c index d8a8088..e7ae123 100644 --- a/lib/libc/db/recno/rec_get.c +++ b/lib/libc/db/recno/rec_get.c @@ -34,10 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rec_get.c 8.9 (Berkeley) 8/18/94"; #endif /* LIBC_SCCS and not lint */ - -#if !defined(lint) -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c index 4098b18..5370577 100644 --- a/lib/libc/db/recno/rec_open.c +++ b/lib/libc/db/recno/rec_open.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rec_open.c 8.10 (Berkeley) 9/1/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c index 69220a5..10210d5 100644 --- a/lib/libc/db/recno/rec_put.c +++ b/lib/libc/db/recno/rec_put.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rec_put.c 8.7 (Berkeley) 8/18/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c index f80992c..bf95b8c 100644 --- a/lib/libc/db/recno/rec_seq.c +++ b/lib/libc/db/recno/rec_seq.c @@ -34,6 +34,8 @@ #ifndef lint static char sccsid[] = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/db/recno/rec_utils.c b/lib/libc/db/recno/rec_utils.c index baea3fa..1ace3ba 100644 --- a/lib/libc/db/recno/rec_utils.c +++ b/lib/libc/db/recno/rec_utils.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rec_utils.c 8.6 (Berkeley) 7/16/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c index b7c3c70..ec367e1 100644 --- a/lib/libc/db/test/dbtest.c +++ b/lib/libc/db/test/dbtest.c @@ -37,13 +37,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -#if 0 +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)dbtest.c 8.17 (Berkeley) 9/1/94"; -#endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/lib/libc/db/test/hash.tests/driver2.c b/lib/libc/db/test/hash.tests/driver2.c index 896820c..8b1c644 100644 --- a/lib/libc/db/test/hash.tests/driver2.c +++ b/lib/libc/db/test/hash.tests/driver2.c @@ -40,9 +40,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)driver2.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Test driver, to try to tackle the large ugly-split problem. diff --git a/lib/libc/db/test/hash.tests/tcreat3.c b/lib/libc/db/test/hash.tests/tcreat3.c index 31211c5..eff661a 100644 --- a/lib/libc/db/test/hash.tests/tcreat3.c +++ b/lib/libc/db/test/hash.tests/tcreat3.c @@ -40,9 +40,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)tcreat3.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/file.h> diff --git a/lib/libc/db/test/hash.tests/tdel.c b/lib/libc/db/test/hash.tests/tdel.c index fb99431..0a5eabb 100644 --- a/lib/libc/db/test/hash.tests/tdel.c +++ b/lib/libc/db/test/hash.tests/tdel.c @@ -40,9 +40,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)tdel.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/file.h> diff --git a/lib/libc/db/test/hash.tests/thash4.c b/lib/libc/db/test/hash.tests/thash4.c index 952dccb..90b3783 100644 --- a/lib/libc/db/test/hash.tests/thash4.c +++ b/lib/libc/db/test/hash.tests/thash4.c @@ -40,9 +40,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)thash4.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/file.h> diff --git a/lib/libc/db/test/hash.tests/tread2.c b/lib/libc/db/test/hash.tests/tread2.c index 8f01556..75f9fbb 100644 --- a/lib/libc/db/test/hash.tests/tread2.c +++ b/lib/libc/db/test/hash.tests/tread2.c @@ -40,9 +40,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)tread2.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/file.h> diff --git a/lib/libc/db/test/hash.tests/tseq.c b/lib/libc/db/test/hash.tests/tseq.c index f41c172..4e5dc84 100644 --- a/lib/libc/db/test/hash.tests/tseq.c +++ b/lib/libc/db/test/hash.tests/tseq.c @@ -40,9 +40,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)tseq.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/file.h> diff --git a/lib/libc/db/test/hash.tests/tverify.c b/lib/libc/db/test/hash.tests/tverify.c index ac5d2f9..18505f5 100644 --- a/lib/libc/db/test/hash.tests/tverify.c +++ b/lib/libc/db/test/hash.tests/tverify.c @@ -40,9 +40,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)tverify.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/file.h> diff --git a/lib/libc/gen/_rand48.c b/lib/libc/gen/_rand48.c index 990e2c8..279bbc3 100644 --- a/lib/libc/gen/_rand48.c +++ b/lib/libc/gen/_rand48.c @@ -11,6 +11,9 @@ * to anyone/anything when using this software. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "rand48.h" unsigned short _rand48_seed[3] = { diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c index ad063b8..3fbb68f 100644 --- a/lib/libc/gen/arc4random.c +++ b/lib/libc/gen/arc4random.c @@ -25,12 +25,15 @@ * RC4 is a registered trademark of RSA Laboratories. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" +#include <sys/types.h> +#include <sys/time.h> #include <stdlib.h> #include <fcntl.h> #include <unistd.h> -#include <sys/types.h> -#include <sys/time.h> #include "un-namespace.h" struct arc4_stream { diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c index fe867c2..91d20db 100644 --- a/lib/libc/gen/clock.c +++ b/lib/libc/gen/clock.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)clock.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/time.h> diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c index 0a7078e..753287d 100644 --- a/lib/libc/gen/confstr.c +++ b/lib/libc/gen/confstr.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)confstr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/sysctl.h> diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c index e43d6ab..4c2ffe3 100644 --- a/lib/libc/gen/ctermid.c +++ b/lib/libc/gen/ctermid.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ctermid.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <paths.h> diff --git a/lib/libc/gen/drand48.c b/lib/libc/gen/drand48.c index cec04a6..672b5ee 100644 --- a/lib/libc/gen/drand48.c +++ b/lib/libc/gen/drand48.c @@ -11,6 +11,9 @@ * to anyone/anything when using this software. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "rand48.h" extern unsigned short _rand48_seed[3]; diff --git a/lib/libc/gen/erand48.c b/lib/libc/gen/erand48.c index 286904c..cdb3ec8 100644 --- a/lib/libc/gen/erand48.c +++ b/lib/libc/gen/erand48.c @@ -11,6 +11,9 @@ * to anyone/anything when using this software. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "rand48.h" double diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c index c2a399b..e3a5142 100644 --- a/lib/libc/gen/err.c +++ b/lib/libc/gen/err.c @@ -31,12 +31,9 @@ * SUCH DAMAGE. */ -#if 0 #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#endif - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/lib/libc/gen/errlst.c b/lib/libc/gen/errlst.c index 4d66fbe..08a9625 100644 --- a/lib/libc/gen/errlst.c +++ b/lib/libc/gen/errlst.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)errlst.c 8.2 (Berkeley) 11/16/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c index 6f951e7..b50b14e 100644 --- a/lib/libc/gen/getbsize.c +++ b/lib/libc/gen/getbsize.c @@ -31,9 +31,11 @@ * SUCH DAMAGE. */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <stdio.h> diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c index 7e15bb8..02619e4 100644 --- a/lib/libc/gen/getgrouplist.c +++ b/lib/libc/gen/getgrouplist.c @@ -31,12 +31,9 @@ * SUCH DAMAGE. */ -#if 0 #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; #endif /* LIBC_SCCS and not lint */ -#endif - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c index 64bd64d..a5cd290 100644 --- a/lib/libc/gen/gethostname.c +++ b/lib/libc/gen/gethostname.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostname.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/sysctl.h> diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c index 811dbda..5022d0d 100644 --- a/lib/libc/gen/getloadavg.c +++ b/lib/libc/gen/getloadavg.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getloadavg.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/time.h> diff --git a/lib/libc/gen/jrand48.c b/lib/libc/gen/jrand48.c index 051d5a6..1707620 100644 --- a/lib/libc/gen/jrand48.c +++ b/lib/libc/gen/jrand48.c @@ -11,6 +11,9 @@ * to anyone/anything when using this software. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "rand48.h" long diff --git a/lib/libc/gen/lcong48.c b/lib/libc/gen/lcong48.c index f13826b..ab0d1f7 100644 --- a/lib/libc/gen/lcong48.c +++ b/lib/libc/gen/lcong48.c @@ -11,6 +11,9 @@ * to anyone/anything when using this software. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "rand48.h" extern unsigned short _rand48_seed[3]; diff --git a/lib/libc/gen/lrand48.c b/lib/libc/gen/lrand48.c index a3d0111..44a7f5d 100644 --- a/lib/libc/gen/lrand48.c +++ b/lib/libc/gen/lrand48.c @@ -11,6 +11,9 @@ * to anyone/anything when using this software. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "rand48.h" extern unsigned short _rand48_seed[3]; diff --git a/lib/libc/gen/mrand48.c b/lib/libc/gen/mrand48.c index b23db51..ef20fb87b 100644 --- a/lib/libc/gen/mrand48.c +++ b/lib/libc/gen/mrand48.c @@ -11,6 +11,9 @@ * to anyone/anything when using this software. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "rand48.h" extern unsigned short _rand48_seed[3]; diff --git a/lib/libc/gen/msgctl.c b/lib/libc/gen/msgctl.c index 7b74c51e..bf4b40f 100644 --- a/lib/libc/gen/msgctl.c +++ b/lib/libc/gen/msgctl.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/ipc.h> #include <sys/msg.h> diff --git a/lib/libc/gen/msgget.c b/lib/libc/gen/msgget.c index 3e146b0..b497074 100644 --- a/lib/libc/gen/msgget.c +++ b/lib/libc/gen/msgget.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/ipc.h> #include <sys/msg.h> diff --git a/lib/libc/gen/msgrcv.c b/lib/libc/gen/msgrcv.c index 5c1e387..e4f77c5 100644 --- a/lib/libc/gen/msgrcv.c +++ b/lib/libc/gen/msgrcv.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/ipc.h> #include <sys/msg.h> diff --git a/lib/libc/gen/msgsnd.c b/lib/libc/gen/msgsnd.c index a620915..ca9da96 100644 --- a/lib/libc/gen/msgsnd.c +++ b/lib/libc/gen/msgsnd.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/ipc.h> #include <sys/msg.h> diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c index 104c1a2..8ec41d1 100644 --- a/lib/libc/gen/nice.c +++ b/lib/libc/gen/nice.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)nice.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/time.h> diff --git a/lib/libc/gen/nrand48.c b/lib/libc/gen/nrand48.c index 6c54065..16c8ca1 100644 --- a/lib/libc/gen/nrand48.c +++ b/lib/libc/gen/nrand48.c @@ -11,6 +11,9 @@ * to anyone/anything when using this software. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "rand48.h" long diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c index 2562c81..debea3b 100644 --- a/lib/libc/gen/raise.c +++ b/lib/libc/gen/raise.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)raise.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <signal.h> #include <unistd.h> diff --git a/lib/libc/gen/seed48.c b/lib/libc/gen/seed48.c index 258c4ba..5339b8c 100644 --- a/lib/libc/gen/seed48.c +++ b/lib/libc/gen/seed48.c @@ -11,6 +11,9 @@ * to anyone/anything when using this software. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "rand48.h" extern unsigned short _rand48_seed[3]; diff --git a/lib/libc/gen/semconfig.c b/lib/libc/gen/semconfig.c index cf5399b..e8f247c 100644 --- a/lib/libc/gen/semconfig.c +++ b/lib/libc/gen/semconfig.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/ipc.h> #include <sys/sem.h> diff --git a/lib/libc/gen/semctl.c b/lib/libc/gen/semctl.c index 03ecdbc..3eded93 100644 --- a/lib/libc/gen/semctl.c +++ b/lib/libc/gen/semctl.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/ipc.h> #include <sys/sem.h> diff --git a/lib/libc/gen/semget.c b/lib/libc/gen/semget.c index 81c6a86..8d1e6d0 100644 --- a/lib/libc/gen/semget.c +++ b/lib/libc/gen/semget.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/ipc.h> #include <sys/sem.h> diff --git a/lib/libc/gen/semop.c b/lib/libc/gen/semop.c index 0b97c6a..93518e5 100644 --- a/lib/libc/gen/semop.c +++ b/lib/libc/gen/semop.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/ipc.h> #include <sys/sem.h> diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c index 6c3adc3..1f0a14a 100644 --- a/lib/libc/gen/sethostname.c +++ b/lib/libc/gen/sethostname.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)sethostname.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/sysctl.h> diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c index e6987d5..b47e082 100644 --- a/lib/libc/gen/siglist.c +++ b/lib/libc/gen/siglist.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)siglist.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/cdefs.h> #include <signal.h> diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c index 19709d5..ad39ff6 100644 --- a/lib/libc/gen/sysctl.c +++ b/lib/libc/gen/sysctl.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)sysctl.c 8.2 (Berkeley) 1/4/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/sysctl.h> diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c index 044d3a2..5a45d57 100644 --- a/lib/libc/gen/time.c +++ b/lib/libc/gen/time.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/time.h> diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c index a561fd6..7e544ad 100644 --- a/lib/libc/gen/utime.c +++ b/lib/libc/gen/utime.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)utime.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/time.h> diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c index 6035329..456f31d 100644 --- a/lib/libc/gen/valloc.c +++ b/lib/libc/gen/valloc.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)valloc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> #include <unistd.h> diff --git a/lib/libc/i386/gen/frexp.c b/lib/libc/i386/gen/frexp.c index 0882b72..25baeca 100644 --- a/lib/libc/i386/gen/frexp.c +++ b/lib/libc/i386/gen/frexp.c @@ -31,10 +31,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <math.h> diff --git a/lib/libc/i386/gen/infinity.c b/lib/libc/i386/gen/infinity.c index ac92d46..966a06e 100644 --- a/lib/libc/i386/gen/infinity.c +++ b/lib/libc/i386/gen/infinity.c @@ -1,8 +1,10 @@ /* * infinity.c - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <math.h> /* bytes for +Infinity on a 387 */ diff --git a/lib/libc/i386/gen/isinf.c b/lib/libc/i386/gen/isinf.c index 8a34d4b..4c49f9a 100644 --- a/lib/libc/i386/gen/isinf.c +++ b/lib/libc/i386/gen/isinf.c @@ -31,10 +31,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/i386/gen/ldexp.c b/lib/libc/i386/gen/ldexp.c index 3ee9e090..bb82b14 100644 --- a/lib/libc/i386/gen/ldexp.c +++ b/lib/libc/i386/gen/ldexp.c @@ -34,10 +34,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * ldexp(value, exp): return value * (2 ** exp). diff --git a/lib/libc/i386/sys/i386_clr_watch.c b/lib/libc/i386/sys/i386_clr_watch.c index 0320634..ae2ed79 100644 --- a/lib/libc/i386/sys/i386_clr_watch.c +++ b/lib/libc/i386/sys/i386_clr_watch.c @@ -24,18 +24,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. - * - */ - -/* - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <machine/reg.h> #include <machine/sysarch.h> - int i386_clr_watch(int watchnum, struct dbreg * d) { diff --git a/lib/libc/i386/sys/i386_get_ioperm.c b/lib/libc/i386/sys/i386_get_ioperm.c index f70d610..5fe245a 100644 --- a/lib/libc/i386/sys/i386_get_ioperm.c +++ b/lib/libc/i386/sys/i386_get_ioperm.c @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <machine/sysarch.h> diff --git a/lib/libc/i386/sys/i386_get_ldt.c b/lib/libc/i386/sys/i386_get_ldt.c index 647f032..ec95d99 100644 --- a/lib/libc/i386/sys/i386_get_ldt.c +++ b/lib/libc/i386/sys/i386_get_ldt.c @@ -26,10 +26,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/cdefs.h> #include <machine/segments.h> diff --git a/lib/libc/i386/sys/i386_set_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c index a3a2e8b..f23881d 100644 --- a/lib/libc/i386/sys/i386_set_ioperm.c +++ b/lib/libc/i386/sys/i386_set_ioperm.c @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <machine/sysarch.h> diff --git a/lib/libc/i386/sys/i386_set_ldt.c b/lib/libc/i386/sys/i386_set_ldt.c index ac69b05..756d49d 100644 --- a/lib/libc/i386/sys/i386_set_ldt.c +++ b/lib/libc/i386/sys/i386_set_ldt.c @@ -26,10 +26,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/cdefs.h> #include <machine/segments.h> diff --git a/lib/libc/i386/sys/i386_set_watch.c b/lib/libc/i386/sys/i386_set_watch.c index bb710dc..0767cc9 100644 --- a/lib/libc/i386/sys/i386_set_watch.c +++ b/lib/libc/i386/sys/i386_set_watch.c @@ -24,18 +24,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. - * - */ - -/* - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <machine/reg.h> #include <machine/sysarch.h> - int i386_set_watch(int watchnum, unsigned int watchaddr, int size, int access, struct dbreg * d) diff --git a/lib/libc/i386/sys/i386_vm86.c b/lib/libc/i386/sys/i386_vm86.c index 7607746..6abff2d 100644 --- a/lib/libc/i386/sys/i386_vm86.c +++ b/lib/libc/i386/sys/i386_vm86.c @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <machine/sysarch.h> diff --git a/lib/libc/ia64/gen/fpgetmask.c b/lib/libc/ia64/gen/fpgetmask.c index c1b4a75..f3beea8 100644 --- a/lib/libc/ia64/gen/fpgetmask.c +++ b/lib/libc/ia64/gen/fpgetmask.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <ieeefp.h> diff --git a/lib/libc/ia64/gen/fpsetmask.c b/lib/libc/ia64/gen/fpsetmask.c index 4bbfc0b..c69dccb 100644 --- a/lib/libc/ia64/gen/fpsetmask.c +++ b/lib/libc/ia64/gen/fpsetmask.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <ieeefp.h> diff --git a/lib/libc/ia64/gen/frexp.c b/lib/libc/ia64/gen/frexp.c index 67bc444..d4f5139 100644 --- a/lib/libc/ia64/gen/frexp.c +++ b/lib/libc/ia64/gen/frexp.c @@ -1,5 +1,4 @@ /* $NetBSD: frexp.c,v 1.1 1995/02/10 17:50:22 cgd Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,6 +27,9 @@ * rights to redistribute these changes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <machine/ieee.h> #include <math.h> diff --git a/lib/libc/ia64/gen/infinity.c b/lib/libc/ia64/gen/infinity.c index d14057f..a24cea8 100644 --- a/lib/libc/ia64/gen/infinity.c +++ b/lib/libc/ia64/gen/infinity.c @@ -1,5 +1,4 @@ /* $NetBSD: infinity.c,v 1.1 1995/02/10 17:50:23 cgd Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,6 +27,9 @@ * rights to redistribute these changes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <math.h> /* bytes for +Infinity on an ia64 (IEEE double format) */ diff --git a/lib/libc/ia64/gen/isinf.c b/lib/libc/ia64/gen/isinf.c index 3af80bc..d878905 100644 --- a/lib/libc/ia64/gen/isinf.c +++ b/lib/libc/ia64/gen/isinf.c @@ -1,5 +1,4 @@ /* $NetBSD: isinf.c,v 1.1 1995/02/10 17:50:23 cgd Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,6 +27,9 @@ * rights to redistribute these changes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <machine/ieee.h> #include <math.h> diff --git a/lib/libc/ia64/gen/ldexp.c b/lib/libc/ia64/gen/ldexp.c index c9f7674..c431417 100644 --- a/lib/libc/ia64/gen/ldexp.c +++ b/lib/libc/ia64/gen/ldexp.c @@ -1,5 +1,4 @@ /* $NetBSD: ldexp.c,v 1.1 1995/02/10 17:50:24 cgd Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,6 +27,9 @@ * rights to redistribute these changes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <machine/ieee.h> #include <errno.h> diff --git a/lib/libc/ia64/gen/modf.c b/lib/libc/ia64/gen/modf.c index 0dae657..def3aad 100644 --- a/lib/libc/ia64/gen/modf.c +++ b/lib/libc/ia64/gen/modf.c @@ -1,5 +1,4 @@ /* $NetBSD: modf.c,v 1.1 1995/02/10 17:50:25 cgd Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,6 +27,9 @@ * rights to redistribute these changes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <machine/ieee.h> #include <math.h> diff --git a/lib/libc/locale/ansi.c b/lib/libc/locale/ansi.c index c0871fe..891456a 100644 --- a/lib/libc/locale/ansi.c +++ b/lib/libc/locale/ansi.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ansi.c 8.1 (Berkeley) 6/27/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> #include <limits.h> diff --git a/lib/libc/locale/big5.c b/lib/libc/locale/big5.c index 0013e6d..12cc312 100644 --- a/lib/libc/locale/big5.c +++ b/lib/libc/locale/big5.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <rune.h> #include <stddef.h> diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c index 13ad770..347baef 100644 --- a/lib/libc/locale/collate.c +++ b/lib/libc/locale/collate.c @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <rune.h> #include <stdio.h> diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c index c0320ba..657b325 100644 --- a/lib/libc/locale/collcmp.c +++ b/lib/libc/locale/collcmp.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #define ASCII_COMPATIBLE_COLLATE /* see share/colldef */ #include <string.h> diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c index e9ac0db..961bd73 100644 --- a/lib/libc/locale/euc.c +++ b/lib/libc/locale/euc.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/locale/fix_grouping.c b/lib/libc/locale/fix_grouping.c index 5c88e87..db49e18 100644 --- a/lib/libc/locale/fix_grouping.c +++ b/lib/libc/locale/fix_grouping.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <ctype.h> #include <limits.h> #include <stddef.h> diff --git a/lib/libc/locale/frune.c b/lib/libc/locale/frune.c index 443d3ba..79559bf 100644 --- a/lib/libc/locale/frune.c +++ b/lib/libc/locale/frune.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)frune.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <rune.h> diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c index 98e70e4..12574f9 100644 --- a/lib/libc/locale/isctype.c +++ b/lib/libc/locale/isctype.c @@ -37,13 +37,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)isctype.c 8.3 (Berkeley) 2/24/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c index b29ba9e..04288b1 100644 --- a/lib/libc/locale/ldpart.c +++ b/lib/libc/locale/ldpart.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/lib/libc/locale/lmessages.c b/lib/libc/locale/lmessages.c index 4dcd719..8b826f7 100644 --- a/lib/libc/locale/lmessages.c +++ b/lib/libc/locale/lmessages.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stddef.h> #include "lmessages.h" diff --git a/lib/libc/locale/lmonetary.c b/lib/libc/locale/lmonetary.c index dfecd07..2f16e7c 100644 --- a/lib/libc/locale/lmonetary.c +++ b/lib/libc/locale/lmonetary.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <limits.h> #include <stdlib.h> #include "lmonetary.h" diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c index eb6015a..3d1742f 100644 --- a/lib/libc/locale/lnumeric.c +++ b/lib/libc/locale/lnumeric.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <limits.h> #include "lnumeric.h" #include "ldpart.h" diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c index d4c823d..804e9fd 100644 --- a/lib/libc/locale/localeconv.c +++ b/lib/libc/locale/localeconv.c @@ -33,12 +33,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)localeconv.c 8.1 (Berkeley) 6/4/93"; -#endif -static char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <locale.h> #include "lmonetary.h" diff --git a/lib/libc/locale/mbrune.c b/lib/libc/locale/mbrune.c index 92efe83..a6c9920 100644 --- a/lib/libc/locale/mbrune.c +++ b/lib/libc/locale/mbrune.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mbrune.c 8.1 (Berkeley) 6/27/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <rune.h> diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c index 0a41d18..4d1df64 100644 --- a/lib/libc/locale/mskanji.c +++ b/lib/libc/locale/mskanji.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c index 541cdd4..7672e41 100644 --- a/lib/libc/locale/nl_langinfo.c +++ b/lib/libc/locale/nl_langinfo.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <locale.h> #include <langinfo.h> #include <limits.h> diff --git a/lib/libc/locale/nomacros.c b/lib/libc/locale/nomacros.c index 45c0db7..ba49a1f 100644 --- a/lib/libc/locale/nomacros.c +++ b/lib/libc/locale/nomacros.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * Tell <ctype.h> to generate extern versions of all its inline * functions. The extern versions get called if the system doesn't diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c index 9eb178f..f062f90 100644 --- a/lib/libc/locale/none.c +++ b/lib/libc/locale/none.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)none.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stddef.h> #include <stdio.h> diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c index a6b890d..c67773c 100644 --- a/lib/libc/locale/rune.c +++ b/lib/libc/locale/rune.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rune.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <arpa/inet.h> diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c index dde54a4..a2ee9e6 100644 --- a/lib/libc/locale/runetype.c +++ b/lib/libc/locale/runetype.c @@ -32,10 +32,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdio.h> #include <rune.h> diff --git a/lib/libc/locale/setinvalidrune.c b/lib/libc/locale/setinvalidrune.c index 45a2a47..f987236 100644 --- a/lib/libc/locale/setinvalidrune.c +++ b/lib/libc/locale/setinvalidrune.c @@ -34,6 +34,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <rune.h> void diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c index 16211f5..8b18d1e 100644 --- a/lib/libc/locale/setlocale.c +++ b/lib/libc/locale/setlocale.c @@ -35,14 +35,11 @@ * SUCH DAMAGE. */ -#ifdef LIBC_RCS -static const char rcsid[] = - "$FreeBSD$"; -#endif - #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setlocale.c 8.1 (Berkeley) 7/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c index f9b4bf6..f3446a9 100644 --- a/lib/libc/locale/setrunelocale.c +++ b/lib/libc/locale/setrunelocale.c @@ -32,10 +32,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <rune.h> #include <errno.h> #include <limits.h> diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c index ebb0750..c9226bb 100644 --- a/lib/libc/locale/table.c +++ b/lib/libc/locale/table.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/27/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <rune.h> diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c index d9cbd6f..42392d7 100644 --- a/lib/libc/locale/tolower.c +++ b/lib/libc/locale/tolower.c @@ -32,10 +32,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdio.h> #include <rune.h> diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c index d01104b0..1871f8a 100644 --- a/lib/libc/locale/toupper.c +++ b/lib/libc/locale/toupper.c @@ -32,10 +32,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdio.h> #include <rune.h> diff --git a/lib/libc/locale/utf2.c b/lib/libc/locale/utf2.c index 6639baf..592b27b 100644 --- a/lib/libc/locale/utf2.c +++ b/lib/libc/locale/utf2.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)utf2.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <rune.h> #include <stddef.h> diff --git a/lib/libc/mips/gen/flt_rounds.c b/lib/libc/mips/gen/flt_rounds.c index 289ed7c..cb4653b 100644 --- a/lib/libc/mips/gen/flt_rounds.c +++ b/lib/libc/mips/gen/flt_rounds.c @@ -3,6 +3,9 @@ * Public domain. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <machine/float.h> diff --git a/lib/libc/mips/gen/fpgetmask.c b/lib/libc/mips/gen/fpgetmask.c index 8c1a53e..67319db 100644 --- a/lib/libc/mips/gen/fpgetmask.c +++ b/lib/libc/mips/gen/fpgetmask.c @@ -3,9 +3,8 @@ * Public domain. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ieeefp.h> diff --git a/lib/libc/mips/gen/fpgetround.c b/lib/libc/mips/gen/fpgetround.c index 565f7c8..b364481 100644 --- a/lib/libc/mips/gen/fpgetround.c +++ b/lib/libc/mips/gen/fpgetround.c @@ -3,9 +3,8 @@ * Public domain. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ieeefp.h> diff --git a/lib/libc/mips/gen/fpgetsticky.c b/lib/libc/mips/gen/fpgetsticky.c index f7057ff..5ab5b46 100644 --- a/lib/libc/mips/gen/fpgetsticky.c +++ b/lib/libc/mips/gen/fpgetsticky.c @@ -3,9 +3,8 @@ * Public domain. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ieeefp.h> diff --git a/lib/libc/mips/gen/fpsetmask.c b/lib/libc/mips/gen/fpsetmask.c index c57f52f..80645da 100644 --- a/lib/libc/mips/gen/fpsetmask.c +++ b/lib/libc/mips/gen/fpsetmask.c @@ -3,9 +3,8 @@ * Public domain. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ieeefp.h> diff --git a/lib/libc/mips/gen/fpsetround.c b/lib/libc/mips/gen/fpsetround.c index 9516d34..7213556 100644 --- a/lib/libc/mips/gen/fpsetround.c +++ b/lib/libc/mips/gen/fpsetround.c @@ -3,9 +3,8 @@ * Public domain. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ieeefp.h> diff --git a/lib/libc/net/addr2ascii.c b/lib/libc/net/addr2ascii.c index 5bee3ea..4fad6a8 100644 --- a/lib/libc/net/addr2ascii.c +++ b/lib/libc/net/addr2ascii.c @@ -29,6 +29,9 @@ * $ANA: addr2ascii.c,v 1.1 1996/06/13 18:41:46 wollman Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/socket.h> diff --git a/lib/libc/net/ascii2addr.c b/lib/libc/net/ascii2addr.c index 0b5bab4..5167a51 100644 --- a/lib/libc/net/ascii2addr.c +++ b/lib/libc/net/ascii2addr.c @@ -29,6 +29,9 @@ * $ANA: ascii2addr.c,v 1.2 1996/06/13 18:46:02 wollman Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/socket.h> diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c index 1301b6a..4335030 100644 --- a/lib/libc/net/base64.c +++ b/lib/libc/net/base64.c @@ -40,9 +40,8 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -#if !defined(LINT) && !defined(CODECENTER) -static char rcsid[] = "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index 2e0cbb7..5ce1b99 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $ */ /* @@ -83,6 +82,9 @@ * - classful IPv4 numeric (127.1) is allowed. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c index b41a7a0..47ca575 100644 --- a/lib/libc/net/gethostbydns.c +++ b/lib/libc/net/gethostbydns.c @@ -56,8 +56,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c index c05d8b3..e4320fd 100644 --- a/lib/libc/net/gethostbyht.c +++ b/lib/libc/net/gethostbyht.c @@ -53,8 +53,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c index 3667be4..ad336fc 100644 --- a/lib/libc/net/gethostbynis.c +++ b/lib/libc/net/gethostbynis.c @@ -23,10 +23,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c index 697529a..021acf2 100644 --- a/lib/libc/net/gethostnamadr.c +++ b/lib/libc/net/gethostnamadr.c @@ -23,10 +23,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c index c56f79b..3a2329f 100644 --- a/lib/libc/net/getifaddrs.c +++ b/lib/libc/net/getifaddrs.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */ /* @@ -29,6 +28,10 @@ * NOTE: SIOCGIFCONF case is not LP64 friendly. it also does not perform * try-and-error for region size. */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/types.h> #include <sys/ioctl.h> diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c index 7ca051c..2acef3e 100644 --- a/lib/libc/net/getnameinfo.c +++ b/lib/libc/net/getnameinfo.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */ /* @@ -42,6 +41,9 @@ * and sin6_scope_id filled */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/socket.h> #include <net/if.h> diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c index ed208f0..a84fde5 100644 --- a/lib/libc/net/getnetbydns.c +++ b/lib/libc/net/getnetbydns.c @@ -60,8 +60,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c index 59c8cd7..6eaebc5 100644 --- a/lib/libc/net/getnetbyht.c +++ b/lib/libc/net/getnetbyht.c @@ -44,8 +44,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getnetent.c 8.1 (Berkeley) 6/4/93"; static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp"; -static chat rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c index f8c7fee..abeb093 100644 --- a/lib/libc/net/getnetbynis.c +++ b/lib/libc/net/getnetbynis.c @@ -23,10 +23,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c index 815285a..6eb7d22 100644 --- a/lib/libc/net/getnetnamadr.c +++ b/lib/libc/net/getnetnamadr.c @@ -23,9 +23,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> diff --git a/lib/libc/net/herror.c b/lib/libc/net/herror.c index a4b4e3d..9f3dbb7 100644 --- a/lib/libc/net/herror.c +++ b/lib/libc/net/herror.c @@ -50,8 +50,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c index f94c316..701244a 100644 --- a/lib/libc/net/hesiod.c +++ b/lib/libc/net/hesiod.c @@ -45,10 +45,11 @@ #include <sys/cdefs.h> -#if defined(LIBC_SCCS) && !defined(lint) +#if 0 static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $"; -static char *rcsid = "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/ifname.c b/lib/libc/net/ifname.c index 94fb951..d383038 100644 --- a/lib/libc/net/ifname.c +++ b/lib/libc/net/ifname.c @@ -25,9 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * TODO: * - prototype defs into arpa/inet.h, not net/if.h (bsd-api-new-02) diff --git a/lib/libc/net/inet_addr.c b/lib/libc/net/inet_addr.c index 5335687f..b305524 100644 --- a/lib/libc/net/inet_addr.c +++ b/lib/libc/net/inet_addr.c @@ -55,8 +55,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/lib/libc/net/inet_lnaof.c b/lib/libc/net/inet_lnaof.c index e79a39b..e45ea6e 100644 --- a/lib/libc/net/inet_lnaof.c +++ b/lib/libc/net/inet_lnaof.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_lnaof.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <netinet/in.h> diff --git a/lib/libc/net/inet_makeaddr.c b/lib/libc/net/inet_makeaddr.c index ffc01cc..4e97513 100644 --- a/lib/libc/net/inet_makeaddr.c +++ b/lib/libc/net/inet_makeaddr.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_makeaddr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <netinet/in.h> diff --git a/lib/libc/net/inet_net_ntop.c b/lib/libc/net/inet_net_ntop.c index 215ff1d..8f3b1d7 100644 --- a/lib/libc/net/inet_net_ntop.c +++ b/lib/libc/net/inet_net_ntop.c @@ -17,8 +17,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char orig_rcsid[] = "From Id: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp"; -static const char rcsid[] = "$FreeBSD$"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> diff --git a/lib/libc/net/inet_net_pton.c b/lib/libc/net/inet_net_pton.c index 5452d68..85b05c6 100644 --- a/lib/libc/net/inet_net_pton.c +++ b/lib/libc/net/inet_net_pton.c @@ -17,8 +17,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char orig_rcsid[] = "From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $"; -static const char rcsid[] = "$FreeBSD$"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> diff --git a/lib/libc/net/inet_neta.c b/lib/libc/net/inet_neta.c index f92705c..f7c7ded 100644 --- a/lib/libc/net/inet_neta.c +++ b/lib/libc/net/inet_neta.c @@ -17,8 +17,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char orig_rcsid[] = "From Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp"; -static const char rcsid[] = "$FreeBSD$"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> diff --git a/lib/libc/net/inet_netof.c b/lib/libc/net/inet_netof.c index feba96b..336eccd 100644 --- a/lib/libc/net/inet_netof.c +++ b/lib/libc/net/inet_netof.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_netof.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <netinet/in.h> diff --git a/lib/libc/net/inet_network.c b/lib/libc/net/inet_network.c index 5ee0c8e..631cb6a 100644 --- a/lib/libc/net/inet_network.c +++ b/lib/libc/net/inet_network.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <netinet/in.h> diff --git a/lib/libc/net/inet_ntoa.c b/lib/libc/net/inet_ntoa.c index f417ee9..00f5492 100644 --- a/lib/libc/net/inet_ntoa.c +++ b/lib/libc/net/inet_ntoa.c @@ -31,12 +31,9 @@ * SUCH DAMAGE. */ -#if 0 #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_ntoa.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#endif - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c index 4b1af69..2a84662 100644 --- a/lib/libc/net/inet_ntop.c +++ b/lib/libc/net/inet_ntop.c @@ -17,7 +17,6 @@ #if defined(LIBC_SCCS) && !defined(lint) static char rcsid[] = "$Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c index 32b3ab7..d4cb90b 100644 --- a/lib/libc/net/inet_pton.c +++ b/lib/libc/net/inet_pton.c @@ -14,9 +14,8 @@ * SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/types.h> diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c index b692a91..bbd7891 100644 --- a/lib/libc/net/ip6opt.c +++ b/lib/libc/net/ip6opt.c @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/lib/libc/net/map_v4v6.c b/lib/libc/net/map_v4v6.c index cc6bb36..c3bab94 100644 --- a/lib/libc/net/map_v4v6.c +++ b/lib/libc/net/map_v4v6.c @@ -55,8 +55,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c index 2e445da..4a6d518 100644 --- a/lib/libc/net/name6.c +++ b/lib/libc/net/name6.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $ */ /* @@ -94,6 +93,9 @@ * rewrite resolvers to be thread safe */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <sys/param.h> #include <sys/socket.h> diff --git a/lib/libc/net/ns_addr.c b/lib/libc/net/ns_addr.c index a9558b6..6ebcbbb3 100644 --- a/lib/libc/net/ns_addr.c +++ b/lib/libc/net/ns_addr.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ns_addr.c 8.1 (Berkeley) 6/7/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <arpa/inet.h> diff --git a/lib/libc/net/ns_name.c b/lib/libc/net/ns_name.c index cbaf7bd..0183fdf 100644 --- a/lib/libc/net/ns_name.c +++ b/lib/libc/net/ns_name.c @@ -15,9 +15,8 @@ * SOFTWARE. */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/net/ns_netint.c b/lib/libc/net/ns_netint.c index 5e25b49..845a07e 100644 --- a/lib/libc/net/ns_netint.c +++ b/lib/libc/net/ns_netint.c @@ -15,9 +15,8 @@ * SOFTWARE. */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* Import. */ diff --git a/lib/libc/net/ns_ntoa.c b/lib/libc/net/ns_ntoa.c index 0f9458f..0063a8c 100644 --- a/lib/libc/net/ns_ntoa.c +++ b/lib/libc/net/ns_ntoa.c @@ -31,12 +31,9 @@ * SUCH DAMAGE. */ -#if 0 #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ns_ntoa.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#endif - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/lib/libc/net/ns_parse.c b/lib/libc/net/ns_parse.c index d3653b1..7b32fa4 100644 --- a/lib/libc/net/ns_parse.c +++ b/lib/libc/net/ns_parse.c @@ -15,9 +15,8 @@ * SOFTWARE. */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/net/ns_print.c b/lib/libc/net/ns_print.c index 6be8c80..52e5b03 100644 --- a/lib/libc/net/ns_print.c +++ b/lib/libc/net/ns_print.c @@ -15,9 +15,8 @@ * SOFTWARE. */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* Import. */ diff --git a/lib/libc/net/ns_ttl.c b/lib/libc/net/ns_ttl.c index 3327d86..1ad4caf 100644 --- a/lib/libc/net/ns_ttl.c +++ b/lib/libc/net/ns_ttl.c @@ -15,9 +15,8 @@ * SOFTWARE. */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* Import. */ diff --git a/lib/libc/net/nsap_addr.c b/lib/libc/net/nsap_addr.c index cc1ea19..61b315f 100644 --- a/lib/libc/net/nsap_addr.c +++ b/lib/libc/net/nsap_addr.c @@ -15,9 +15,8 @@ * SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c index cedbd90..307b2c6 100644 --- a/lib/libc/net/nsdispatch.c +++ b/lib/libc/net/nsdispatch.c @@ -37,10 +37,7 @@ */ #include <sys/cdefs.h> -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = - "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c index 19a1f17..8ed3cb9 100644 --- a/lib/libc/net/rcmd.c +++ b/lib/libc/net/rcmd.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/param.h> diff --git a/lib/libc/net/recv.c b/lib/libc/net/recv.c index 6d4ac0e..267e171 100644 --- a/lib/libc/net/recv.c +++ b/lib/libc/net/recv.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)recv.c 8.2 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c index 0d237ac..ef99c22 100644 --- a/lib/libc/net/res_comp.c +++ b/lib/libc/net/res_comp.c @@ -71,8 +71,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/res_data.c b/lib/libc/net/res_data.c index 501ca32..70a7d9e 100644 --- a/lib/libc/net/res_data.c +++ b/lib/libc/net/res_data.c @@ -15,9 +15,8 @@ * SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/res_debug.c b/lib/libc/net/res_debug.c index b6ed1f5..22805ac 100644 --- a/lib/libc/net/res_debug.c +++ b/lib/libc/net/res_debug.c @@ -95,8 +95,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c index 68796ba..e855ccb 100644 --- a/lib/libc/net/res_init.c +++ b/lib/libc/net/res_init.c @@ -71,8 +71,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/res_mkquery.c b/lib/libc/net/res_mkquery.c index 8f7a7a8..f079e0d 100644 --- a/lib/libc/net/res_mkquery.c +++ b/lib/libc/net/res_mkquery.c @@ -71,8 +71,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93"; static char orig_rcsid[] = "From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/res_mkupdate.c b/lib/libc/net/res_mkupdate.c index 7344197..6e0807d 100644 --- a/lib/libc/net/res_mkupdate.c +++ b/lib/libc/net/res_mkupdate.c @@ -20,9 +20,8 @@ * <viraj_bais@ccm.fm.intel.com> */ -#if !defined(lint) && !defined(SABER) -static char rcsid[] = "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/res_query.c b/lib/libc/net/res_query.c index 6a46f29..4a63701 100644 --- a/lib/libc/net/res_query.c +++ b/lib/libc/net/res_query.c @@ -71,8 +71,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93"; static char orig_rcsid = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c index 47146e8..72fa668 100644 --- a/lib/libc/net/res_send.c +++ b/lib/libc/net/res_send.c @@ -71,8 +71,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; static char orig_rcsid[] = "From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $"; -static char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Send query to name server and wait for reply. diff --git a/lib/libc/net/res_update.c b/lib/libc/net/res_update.c index 6622efd..f17374f 100644 --- a/lib/libc/net/res_update.c +++ b/lib/libc/net/res_update.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(SABER) -static char rcsid[] = "$FreeBSD$"; -#endif /* not lint */ - /* * Copyright (c) 1996 by Internet Software Consortium. * @@ -24,6 +20,9 @@ static char rcsid[] = "$FreeBSD$"; * <viraj_bais@ccm.fm.intel.com> */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c index c919313..da906b2 100644 --- a/lib/libc/net/rthdr.c +++ b/lib/libc/net/rthdr.c @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/lib/libc/net/send.c b/lib/libc/net/send.c index 81ded52..f10d21b 100644 --- a/lib/libc/net/send.c +++ b/lib/libc/net/send.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)send.c 8.2 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/net/vars.c b/lib/libc/net/vars.c index bf6b57a..72b47c8 100644 --- a/lib/libc/net/vars.c +++ b/lib/libc/net/vars.c @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <netinet/in.h> diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c index 0a3f5c6..ff60122 100644 --- a/lib/libc/nls/msgcat.c +++ b/lib/libc/nls/msgcat.c @@ -30,10 +30,8 @@ up-to-date. Many thanks. ******************************************************************/ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * We need a better way of handling errors than printing text. I need diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c index 3a425cc..7e2f955 100644 --- a/lib/libc/posix1e/acl_calc_mask.c +++ b/lib/libc/posix1e/acl_calc_mask.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c index 15b9d9c..6d1e0a8 100644 --- a/lib/libc/posix1e/acl_copy.c +++ b/lib/libc/posix1e/acl_copy.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c index 2f5205d..fc929c4 100644 --- a/lib/libc/posix1e/acl_delete.c +++ b/lib/libc/posix1e/acl_delete.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * acl_delete_def_file -- remove a default acl from a file */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c index 7169c6f..e867ff6 100644 --- a/lib/libc/posix1e/acl_delete_entry.c +++ b/lib/libc/posix1e/acl_delete_entry.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c index 3962da6..f5bdbed 100644 --- a/lib/libc/posix1e/acl_entry.c +++ b/lib/libc/posix1e/acl_entry.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c index b4aeb1ab..6de41da 100644 --- a/lib/libc/posix1e/acl_free.c +++ b/lib/libc/posix1e/acl_free.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * acl_free -- free ACL objects from user memory */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c index 78a8bd0..59d9142 100644 --- a/lib/libc/posix1e/acl_from_text.c +++ b/lib/libc/posix1e/acl_from_text.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * acl_from_text: Convert a text-form ACL from a string to an acl_t. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c index 94bb0a2..87a51dd 100644 --- a/lib/libc/posix1e/acl_get.c +++ b/lib/libc/posix1e/acl_get.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * acl_get_file - syscall wrapper for retrieving ACL by filename @@ -36,6 +34,9 @@ * acl_get_tag_type() returns the tag type for the ACL entry entry_d */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c index 08b7448..6ce40de 100644 --- a/lib/libc/posix1e/acl_init.c +++ b/lib/libc/posix1e/acl_init.c @@ -22,14 +22,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * acl_init -- return a fresh acl structure * acl_dup -- duplicate an acl and return the new copy */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c index 21a8a77..c3375e0 100644 --- a/lib/libc/posix1e/acl_perm.c +++ b/lib/libc/posix1e/acl_perm.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c index c9a2885..b9e6860 100644 --- a/lib/libc/posix1e/acl_set.c +++ b/lib/libc/posix1e/acl_set.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * acl_set_file -- set a file/directory ACL by name */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_size.c b/lib/libc/posix1e/acl_size.c index 0d972ef..e8bd0a4 100644 --- a/lib/libc/posix1e/acl_size.c +++ b/lib/libc/posix1e/acl_size.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c index e665d8e..93e98bb 100644 --- a/lib/libc/posix1e/acl_support.c +++ b/lib/libc/posix1e/acl_support.c @@ -22,14 +22,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * Support functionality for the POSIX.1e ACL interface * These calls are intended only to be called within the library. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c index 50b294b..ea0770d 100644 --- a/lib/libc/posix1e/acl_to_text.c +++ b/lib/libc/posix1e/acl_to_text.c @@ -22,14 +22,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * acl_to_text - return a text string with a text representation of the acl * in it. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c index e8d2df7..179e47e 100644 --- a/lib/libc/posix1e/acl_valid.c +++ b/lib/libc/posix1e/acl_valid.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * acl_valid -- POSIX.1e ACL check routine */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/acl.h> diff --git a/lib/libc/posix1e/cap_clear.c b/lib/libc/posix1e/cap_clear.c index 399886f..076e295 100644 --- a/lib/libc/posix1e/cap_clear.c +++ b/lib/libc/posix1e/cap_clear.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> diff --git a/lib/libc/posix1e/cap_cmp.c b/lib/libc/posix1e/cap_cmp.c index 77bb6ca..6ca201e 100644 --- a/lib/libc/posix1e/cap_cmp.c +++ b/lib/libc/posix1e/cap_cmp.c @@ -20,14 +20,14 @@ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ - /* * Capabiltiy comparison functions cap_subset, cap_equal. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* define this to pull in the cap macros the kernel uses */ #include <sys/types.h> #define _CAPABILITY_NEEDMACROS diff --git a/lib/libc/posix1e/cap_copy.c b/lib/libc/posix1e/cap_copy.c index 21822c0..fdfd73e 100644 --- a/lib/libc/posix1e/cap_copy.c +++ b/lib/libc/posix1e/cap_copy.c @@ -20,10 +20,7 @@ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ - /* * TrustedBSD implementation of cap_copy_ext()/cap_copy_int() * @@ -35,6 +32,9 @@ * segfault. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/capability.h> diff --git a/lib/libc/posix1e/cap_dup.c b/lib/libc/posix1e/cap_dup.c index 50db981..0268c8c 100644 --- a/lib/libc/posix1e/cap_dup.c +++ b/lib/libc/posix1e/cap_dup.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> diff --git a/lib/libc/posix1e/cap_free.c b/lib/libc/posix1e/cap_free.c index 20ec193..52bf1f3 100644 --- a/lib/libc/posix1e/cap_free.c +++ b/lib/libc/posix1e/cap_free.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> diff --git a/lib/libc/posix1e/cap_get_fd.c b/lib/libc/posix1e/cap_get_fd.c index 788c7ea..1ac8fed 100644 --- a/lib/libc/posix1e/cap_get_fd.c +++ b/lib/libc/posix1e/cap_get_fd.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> diff --git a/lib/libc/posix1e/cap_get_file.c b/lib/libc/posix1e/cap_get_file.c index d1ff64c..3df6260 100644 --- a/lib/libc/posix1e/cap_get_file.c +++ b/lib/libc/posix1e/cap_get_file.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> diff --git a/lib/libc/posix1e/cap_get_flag.c b/lib/libc/posix1e/cap_get_flag.c index 3694cbb..d5bae2a 100644 --- a/lib/libc/posix1e/cap_get_flag.c +++ b/lib/libc/posix1e/cap_get_flag.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #define _CAPABILITY_NEEDMACROS diff --git a/lib/libc/posix1e/cap_get_proc.c b/lib/libc/posix1e/cap_get_proc.c index 30afaef..d4eb92a 100644 --- a/lib/libc/posix1e/cap_get_proc.c +++ b/lib/libc/posix1e/cap_get_proc.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> diff --git a/lib/libc/posix1e/cap_init.c b/lib/libc/posix1e/cap_init.c index 61c0d59..23b5100 100644 --- a/lib/libc/posix1e/cap_init.c +++ b/lib/libc/posix1e/cap_init.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> diff --git a/lib/libc/posix1e/cap_set_fd.c b/lib/libc/posix1e/cap_set_fd.c index f6791b9..3bcafd5 100644 --- a/lib/libc/posix1e/cap_set_fd.c +++ b/lib/libc/posix1e/cap_set_fd.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> diff --git a/lib/libc/posix1e/cap_set_file.c b/lib/libc/posix1e/cap_set_file.c index d1e5de1..26f9bb4 100644 --- a/lib/libc/posix1e/cap_set_file.c +++ b/lib/libc/posix1e/cap_set_file.c @@ -22,19 +22,19 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> #include "un-namespace.h" - int cap_set_file(const char *path_p, cap_t cap_p) { diff --git a/lib/libc/posix1e/cap_set_flag.c b/lib/libc/posix1e/cap_set_flag.c index 79e438f..312573f 100644 --- a/lib/libc/posix1e/cap_set_flag.c +++ b/lib/libc/posix1e/cap_set_flag.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" /* need capability.h macros */ diff --git a/lib/libc/posix1e/cap_set_proc.c b/lib/libc/posix1e/cap_set_proc.c index 724add6..6ef33a9 100644 --- a/lib/libc/posix1e/cap_set_proc.c +++ b/lib/libc/posix1e/cap_set_proc.c @@ -22,18 +22,18 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> #include "un-namespace.h" - #include <sys/errno.h> int diff --git a/lib/libc/posix1e/cap_text.c b/lib/libc/posix1e/cap_text.c index 05cfe0d..87a3080 100644 --- a/lib/libc/posix1e/cap_text.c +++ b/lib/libc/posix1e/cap_text.c @@ -22,13 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * TrustedBSD Project - support for POSIX.1e process capabilities */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include "namespace.h" #include <sys/capability.h> diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c index df147e0..e9d28a3 100644 --- a/lib/libc/posix1e/extattr.c +++ b/lib/libc/posix1e/extattr.c @@ -23,14 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - /* * TrustedBSD: Utility functions for extended attributes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/extattr.h> diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c index 73be605..d0cd68a 100644 --- a/lib/libc/quad/TESTS/divrem.c +++ b/lib/libc/quad/TESTS/divrem.c @@ -41,9 +41,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)divrem.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c index 1ab00f1..8992c7c 100644 --- a/lib/libc/quad/TESTS/mul.c +++ b/lib/libc/quad/TESTS/mul.c @@ -41,9 +41,11 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mul.c 8.1 (Berkeley) 6/4/93"; -#endif /* not lint */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/lib/libc/quad/adddi3.c b/lib/libc/quad/adddi3.c index d10da47..9fdf16c 100644 --- a/lib/libc/quad/adddi3.c +++ b/lib/libc/quad/adddi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)adddi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/anddi3.c b/lib/libc/quad/anddi3.c index 5ae45ac..37a3e77 100644 --- a/lib/libc/quad/anddi3.c +++ b/lib/libc/quad/anddi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)anddi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/ashldi3.c b/lib/libc/quad/ashldi3.c index 72501ad..85dcb90 100644 --- a/lib/libc/quad/ashldi3.c +++ b/lib/libc/quad/ashldi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ashldi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/ashrdi3.c b/lib/libc/quad/ashrdi3.c index 9ffa5ed..62bb906 100644 --- a/lib/libc/quad/ashrdi3.c +++ b/lib/libc/quad/ashrdi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ashrdi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/cmpdi2.c b/lib/libc/quad/cmpdi2.c index f6e4bdd..7e4d5f7 100644 --- a/lib/libc/quad/cmpdi2.c +++ b/lib/libc/quad/cmpdi2.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)cmpdi2.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/divdi3.c b/lib/libc/quad/divdi3.c index da7b2fc..5390e07 100644 --- a/lib/libc/quad/divdi3.c +++ b/lib/libc/quad/divdi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)divdi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/fixdfdi.c b/lib/libc/quad/fixdfdi.c index 6d57550..fa947ef 100644 --- a/lib/libc/quad/fixdfdi.c +++ b/lib/libc/quad/fixdfdi.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fixdfdi.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/fixsfdi.c b/lib/libc/quad/fixsfdi.c index 448109f..953c6b6 100644 --- a/lib/libc/quad/fixsfdi.c +++ b/lib/libc/quad/fixsfdi.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fixsfdi.c 5.1 (Berkeley) 7/7/92"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/fixunsdfdi.c b/lib/libc/quad/fixunsdfdi.c index 601790f..632b196 100644 --- a/lib/libc/quad/fixunsdfdi.c +++ b/lib/libc/quad/fixunsdfdi.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fixunsdfdi.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/fixunssfdi.c b/lib/libc/quad/fixunssfdi.c index 9405ce7..928e251 100644 --- a/lib/libc/quad/fixunssfdi.c +++ b/lib/libc/quad/fixunssfdi.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fixunssfdi.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/floatdidf.c b/lib/libc/quad/floatdidf.c index 7b90f6e..59ceb15 100644 --- a/lib/libc/quad/floatdidf.c +++ b/lib/libc/quad/floatdidf.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)floatdidf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/floatdisf.c b/lib/libc/quad/floatdisf.c index 7772218..ef53b6b 100644 --- a/lib/libc/quad/floatdisf.c +++ b/lib/libc/quad/floatdisf.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)floatdisf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/floatunsdidf.c b/lib/libc/quad/floatunsdidf.c index 2fb6401..f149dc3 100644 --- a/lib/libc/quad/floatunsdidf.c +++ b/lib/libc/quad/floatunsdidf.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)floatunsdidf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/iordi3.c b/lib/libc/quad/iordi3.c index e225005..d41a53e 100644 --- a/lib/libc/quad/iordi3.c +++ b/lib/libc/quad/iordi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)iordi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/lshldi3.c b/lib/libc/quad/lshldi3.c index 0af6051..aab64f8 100644 --- a/lib/libc/quad/lshldi3.c +++ b/lib/libc/quad/lshldi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)lshldi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/lshrdi3.c b/lib/libc/quad/lshrdi3.c index add2eda..a31f3e1 100644 --- a/lib/libc/quad/lshrdi3.c +++ b/lib/libc/quad/lshrdi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)lshrdi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/moddi3.c b/lib/libc/quad/moddi3.c index fa76ea3..410e6d6 100644 --- a/lib/libc/quad/moddi3.c +++ b/lib/libc/quad/moddi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)moddi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/negdi2.c b/lib/libc/quad/negdi2.c index bb8670d..657319f 100644 --- a/lib/libc/quad/negdi2.c +++ b/lib/libc/quad/negdi2.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)negdi2.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/notdi2.c b/lib/libc/quad/notdi2.c index d624733..80d082c 100644 --- a/lib/libc/quad/notdi2.c +++ b/lib/libc/quad/notdi2.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)notdi2.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/subdi3.c b/lib/libc/quad/subdi3.c index e976345..1c5690a 100644 --- a/lib/libc/quad/subdi3.c +++ b/lib/libc/quad/subdi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)subdi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/ucmpdi2.c b/lib/libc/quad/ucmpdi2.c index e5dfc43..83f9195 100644 --- a/lib/libc/quad/ucmpdi2.c +++ b/lib/libc/quad/ucmpdi2.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ucmpdi2.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/udivdi3.c b/lib/libc/quad/udivdi3.c index 8ddd559..54a539c 100644 --- a/lib/libc/quad/udivdi3.c +++ b/lib/libc/quad/udivdi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)udivdi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/umoddi3.c b/lib/libc/quad/umoddi3.c index 2a85f76..ecc5bdc 100644 --- a/lib/libc/quad/umoddi3.c +++ b/lib/libc/quad/umoddi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)umoddi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/quad/xordi3.c b/lib/libc/quad/xordi3.c index e3a8588..b10aee9 100644 --- a/lib/libc/quad/xordi3.c +++ b/lib/libc/quad/xordi3.c @@ -38,6 +38,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)xordi3.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "quad.h" diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c index 2274c02..a5f39de 100644 --- a/lib/libc/regex/engine.c +++ b/lib/libc/regex/engine.c @@ -35,10 +35,11 @@ * SUCH DAMAGE. * * @(#)engine.c 8.5 (Berkeley) 3/20/94 - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * The matching engine and friends. This file is #included by regexec.c * after suitable #defines of a variety of macros used herein, so that diff --git a/lib/libc/regex/grot/debug.c b/lib/libc/regex/grot/debug.c index 24bad14..02a17e4 100644 --- a/lib/libc/regex/grot/debug.c +++ b/lib/libc/regex/grot/debug.c @@ -1,5 +1,6 @@ -/* $FreeBSD$ - */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/lib/libc/regex/grot/main.c b/lib/libc/regex/grot/main.c index cb56e48..6b2bf38 100644 --- a/lib/libc/regex/grot/main.c +++ b/lib/libc/regex/grot/main.c @@ -1,5 +1,6 @@ -/* $FreeBSD$ - */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdio.h> #include <string.h> #include <sys/types.h> diff --git a/lib/libc/regex/grot/split.c b/lib/libc/regex/grot/split.c index e001f39..70e0ec5 100644 --- a/lib/libc/regex/grot/split.c +++ b/lib/libc/regex/grot/split.c @@ -1,5 +1,6 @@ -/* $FreeBSD$ - */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdio.h> #include <string.h> diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index 54cd771..2dcd497 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -35,13 +35,13 @@ * SUCH DAMAGE. * * @(#)regcomp.c 8.5 (Berkeley) 3/20/94 - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <stdio.h> diff --git a/lib/libc/regex/regfree.c b/lib/libc/regex/regfree.c index 41c04b4..96f2997 100644 --- a/lib/libc/regex/regfree.c +++ b/lib/libc/regex/regfree.c @@ -35,13 +35,13 @@ * SUCH DAMAGE. * * @(#)regfree.c 8.3 (Berkeley) 3/20/94 - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)regfree.c 8.3 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <stdio.h> diff --git a/lib/libc/sparc64/fpu/fpu.c b/lib/libc/sparc64/fpu/fpu.c index 2c454e3..650cf1f 100644 --- a/lib/libc/sparc64/fpu/fpu.c +++ b/lib/libc/sparc64/fpu/fpu.c @@ -62,12 +62,13 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * from: @(#)fpu.c 8.1 (Berkeley) 6/11/93 - * from: NetBSD: fpu.c,v 1.11 2000/12/06 01:47:50 mrg Exp - * - * $FreeBSD$ + * @(#)fpu.c 8.1 (Berkeley) 6/11/93 + * $NetBSD: fpu.c,v 1.11 2000/12/06 01:47:50 mrg Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> #include "namespace.h" diff --git a/lib/libc/sparc64/fpu/fpu_add.c b/lib/libc/sparc64/fpu/fpu_add.c index 5be2261..e321e41 100644 --- a/lib/libc/sparc64/fpu/fpu_add.c +++ b/lib/libc/sparc64/fpu/fpu_add.c @@ -40,11 +40,12 @@ * SUCH DAMAGE. * * @(#)fpu_add.c 8.1 (Berkeley) 6/11/93 - * from: NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp - * - * $FreeBSD$ + * $NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * Perform an FPU add (return x + y). * diff --git a/lib/libc/sparc64/fpu/fpu_compare.c b/lib/libc/sparc64/fpu/fpu_compare.c index 4eaabde..428e8d3 100644 --- a/lib/libc/sparc64/fpu/fpu_compare.c +++ b/lib/libc/sparc64/fpu/fpu_compare.c @@ -40,11 +40,12 @@ * SUCH DAMAGE. * * @(#)fpu_compare.c 8.1 (Berkeley) 6/11/93 - * from: NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp - * - * $FreeBSD$ + * $NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * CMP and CMPE instructions. * diff --git a/lib/libc/sparc64/fpu/fpu_div.c b/lib/libc/sparc64/fpu/fpu_div.c index c3895c2..a7b4782 100644 --- a/lib/libc/sparc64/fpu/fpu_div.c +++ b/lib/libc/sparc64/fpu/fpu_div.c @@ -40,11 +40,12 @@ * SUCH DAMAGE. * * @(#)fpu_div.c 8.1 (Berkeley) 6/11/93 - * from: NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp - * - * $FreeBSD$ + * $NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * Perform an FPU divide (return x / y). */ diff --git a/lib/libc/sparc64/fpu/fpu_explode.c b/lib/libc/sparc64/fpu/fpu_explode.c index 48c22fe..baa2da2 100644 --- a/lib/libc/sparc64/fpu/fpu_explode.c +++ b/lib/libc/sparc64/fpu/fpu_explode.c @@ -40,11 +40,12 @@ * SUCH DAMAGE. * * @(#)fpu_explode.c 8.1 (Berkeley) 6/11/93 - * from: NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp - * - * $FreeBSD$ + * $NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * FPU subroutines: `explode' the machine's `packed binary' format numbers * into our internal format. diff --git a/lib/libc/sparc64/fpu/fpu_implode.c b/lib/libc/sparc64/fpu/fpu_implode.c index cb7b206..27a826a 100644 --- a/lib/libc/sparc64/fpu/fpu_implode.c +++ b/lib/libc/sparc64/fpu/fpu_implode.c @@ -40,11 +40,12 @@ * SUCH DAMAGE. * * @(#)fpu_implode.c 8.1 (Berkeley) 6/11/93 - * from: NetBSD: fpu_implode.c,v 1.8 2001/08/26 05:44:46 eeh Exp - * - * $FreeBSD$ + * $NetBSD: fpu_implode.c,v 1.8 2001/08/26 05:44:46 eeh Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * FPU subroutines: `implode' internal format numbers into the machine's * `packed binary' format. diff --git a/lib/libc/sparc64/fpu/fpu_mul.c b/lib/libc/sparc64/fpu/fpu_mul.c index 4f6b691..0bdb6ff 100644 --- a/lib/libc/sparc64/fpu/fpu_mul.c +++ b/lib/libc/sparc64/fpu/fpu_mul.c @@ -40,11 +40,12 @@ * SUCH DAMAGE. * * @(#)fpu_mul.c 8.1 (Berkeley) 6/11/93 - * from: NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp - * - * $FreeBSD$ + * $NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * Perform an FPU multiply (return x * y). */ diff --git a/lib/libc/sparc64/fpu/fpu_sqrt.c b/lib/libc/sparc64/fpu/fpu_sqrt.c index 044ee07..c35e2bc 100644 --- a/lib/libc/sparc64/fpu/fpu_sqrt.c +++ b/lib/libc/sparc64/fpu/fpu_sqrt.c @@ -40,11 +40,12 @@ * SUCH DAMAGE. * * @(#)fpu_sqrt.c 8.1 (Berkeley) 6/11/93 - * from: NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp - * - * $FreeBSD$ + * $NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * Perform an FPU square root (return sqrt(x)). */ diff --git a/lib/libc/sparc64/fpu/fpu_subr.c b/lib/libc/sparc64/fpu/fpu_subr.c index 7d6769d..97300a3 100644 --- a/lib/libc/sparc64/fpu/fpu_subr.c +++ b/lib/libc/sparc64/fpu/fpu_subr.c @@ -40,11 +40,12 @@ * SUCH DAMAGE. * * @(#)fpu_subr.c 8.1 (Berkeley) 6/11/93 - * from: NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp - * - * $FreeBSD$ + * $NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * FPU subroutines. */ diff --git a/lib/libc/sparc64/gen/infinity.c b/lib/libc/sparc64/gen/infinity.c index 529868e..3a5cd47 100644 --- a/lib/libc/sparc64/gen/infinity.c +++ b/lib/libc/sparc64/gen/infinity.c @@ -1,7 +1,9 @@ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); /* infinity.c */ diff --git a/lib/libc/sparc64/gen/isinf.c b/lib/libc/sparc64/gen/isinf.c index f1f529f..996ad12 100644 --- a/lib/libc/sparc64/gen/isinf.c +++ b/lib/libc/sparc64/gen/isinf.c @@ -24,7 +24,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * from: NetBSD: isinf.c,v 1.1 1995/02/10 17:50:23 cgd Exp + * $NetBSD: isinf.c,v 1.1 1995/02/10 17:50:23 cgd Exp $ * from: FreeBSD: src/lib/libc/alpha/gen/isinf.c,v 1.2 2000/05/10 */ diff --git a/lib/libc/sparc64/gen/ldexp.c b/lib/libc/sparc64/gen/ldexp.c index 5f0fe39..3a85612 100644 --- a/lib/libc/sparc64/gen/ldexp.c +++ b/lib/libc/sparc64/gen/ldexp.c @@ -35,9 +35,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: ldexp.c,v 1.8 1999/08/30 18:28:26 mycroft Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/stdio/_flock_stub.c b/lib/libc/stdio/_flock_stub.c index 2be797a..8abc8e3 100644 --- a/lib/libc/stdio/_flock_stub.c +++ b/lib/libc/stdio/_flock_stub.c @@ -28,9 +28,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ - * */ /* @@ -40,6 +37,9 @@ * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <stdio.h> #include <stdlib.h> diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c index cf4fb3c..276f86f 100644 --- a/lib/libc/stdio/asprintf.c +++ b/lib/libc/stdio/asprintf.c @@ -27,9 +27,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static char rcsid[] = "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c index 3232088..13538d5 100644 --- a/lib/libc/stdio/clrerr.c +++ b/lib/libc/stdio/clrerr.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)clrerr.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c index e70a2da..3524f60 100644 --- a/lib/libc/stdio/fclose.c +++ b/lib/libc/stdio/fclose.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fclose.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <errno.h> diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c index 7b8af8a..961c0d9 100644 --- a/lib/libc/stdio/fdopen.c +++ b/lib/libc/stdio/fdopen.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fdopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c index 60cad53..6ad14aa 100644 --- a/lib/libc/stdio/feof.c +++ b/lib/libc/stdio/feof.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)feof.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c index c4424c6..c0fdecd 100644 --- a/lib/libc/stdio/ferror.c +++ b/lib/libc/stdio/ferror.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)ferror.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index 9ba2ec9..eb40d69 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fflush.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <errno.h> diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c index 684da00..9aba285 100644 --- a/lib/libc/stdio/fgetc.c +++ b/lib/libc/stdio/fgetc.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fgetc.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c index c607a9c..b0f1659 100644 --- a/lib/libc/stdio/fgetln.c +++ b/lib/libc/stdio/fgetln.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fgetln.c 8.2 (Berkeley) 1/2/94"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c index 51f14ef..f5e3aae 100644 --- a/lib/libc/stdio/fgetpos.c +++ b/lib/libc/stdio/fgetpos.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fgetpos.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c index 1802155..9148686 100644 --- a/lib/libc/stdio/fgets.c +++ b/lib/libc/stdio/fgets.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fgets.c 8.2 (Berkeley) 12/22/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c index b8f500e..97f25e3 100644 --- a/lib/libc/stdio/fileno.c +++ b/lib/libc/stdio/fileno.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fileno.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c index 057487d..8b7517a 100644 --- a/lib/libc/stdio/findfp.c +++ b/lib/libc/stdio/findfp.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)findfp.c 8.2 (Berkeley) 1/4/94"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <machine/atomic.h> diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c index be1377d..8a1c7d0 100644 --- a/lib/libc/stdio/flags.c +++ b/lib/libc/stdio/flags.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)flags.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/file.h> diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c index 84989ae..7af0636 100644 --- a/lib/libc/stdio/fopen.c +++ b/lib/libc/stdio/fopen.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c index 27094b3..53c1328 100644 --- a/lib/libc/stdio/fprintf.c +++ b/lib/libc/stdio/fprintf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fprintf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #if __STDC__ diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c index 5f96c6a..b653bc5 100644 --- a/lib/libc/stdio/fpurge.c +++ b/lib/libc/stdio/fpurge.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fpurge.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <errno.h> diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c index d7e8ab4..d502365 100644 --- a/lib/libc/stdio/fputc.c +++ b/lib/libc/stdio/fputc.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fputc.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c index 0967c6a..c885c17 100644 --- a/lib/libc/stdio/fputs.c +++ b/lib/libc/stdio/fputs.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fputs.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c index 08a15ef..a437fc7 100644 --- a/lib/libc/stdio/fread.c +++ b/lib/libc/stdio/fread.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fread.c 8.2 (Berkeley) 12/11/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c index a434d5a..c885673 100644 --- a/lib/libc/stdio/freopen.c +++ b/lib/libc/stdio/freopen.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c index 45c399a..e147e79 100644 --- a/lib/libc/stdio/fscanf.c +++ b/lib/libc/stdio/fscanf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fscanf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c index 621aa5f..2838777 100644 --- a/lib/libc/stdio/fseek.c +++ b/lib/libc/stdio/fseek.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fseek.c 8.3 (Berkeley) 1/2/94"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c index 60ab719..6eeffda 100644 --- a/lib/libc/stdio/fsetpos.c +++ b/lib/libc/stdio/fsetpos.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fsetpos.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <stdio.h> diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c index 9d51750..94e962c 100644 --- a/lib/libc/stdio/ftell.c +++ b/lib/libc/stdio/ftell.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)ftell.c 8.2 (Berkeley) 5/4/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c index 61ecfd8..28da521 100644 --- a/lib/libc/stdio/funopen.c +++ b/lib/libc/stdio/funopen.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)funopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <errno.h> diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index aee2134..192edf8 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c index b943be4..811fb54 100644 --- a/lib/libc/stdio/fwalk.c +++ b/lib/libc/stdio/fwalk.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fwalk.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <machine/atomic.h> diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c index 13653b6..0687714 100644 --- a/lib/libc/stdio/fwrite.c +++ b/lib/libc/stdio/fwrite.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)fwrite.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c index cabc40c..49b4c97 100644 --- a/lib/libc/stdio/getc.c +++ b/lib/libc/stdio/getc.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)getc.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c index 92f714e..e68c52f 100644 --- a/lib/libc/stdio/getchar.c +++ b/lib/libc/stdio/getchar.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)getchar.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * A subroutine version of the macro getchar. diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c index 7989bb6..384cb41 100644 --- a/lib/libc/stdio/gets.c +++ b/lib/libc/stdio/gets.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)gets.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <unistd.h> diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c index 5ebb46b..e748235 100644 --- a/lib/libc/stdio/getw.c +++ b/lib/libc/stdio/getw.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)getw.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c index 8188f50..bc8a468 100644 --- a/lib/libc/stdio/makebuf.c +++ b/lib/libc/stdio/makebuf.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)makebuf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c index 098af8f..826f2bc 100644 --- a/lib/libc/stdio/mktemp.c +++ b/lib/libc/stdio/mktemp.c @@ -32,12 +32,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* #include "namespace.h" */ #include <sys/types.h> diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c index 77886bf..226c189 100644 --- a/lib/libc/stdio/perror.c +++ b/lib/libc/stdio/perror.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)perror.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c index 053ec8e..1d24931 100644 --- a/lib/libc/stdio/printf.c +++ b/lib/libc/stdio/printf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #if __STDC__ diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c index ca32e54..feec003 100644 --- a/lib/libc/stdio/putc.c +++ b/lib/libc/stdio/putc.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)putc.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c index f1c727b..8f96116 100644 --- a/lib/libc/stdio/putchar.c +++ b/lib/libc/stdio/putchar.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)putchar.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c index cdf1b53..3405521 100644 --- a/lib/libc/stdio/puts.c +++ b/lib/libc/stdio/puts.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)puts.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c index a7e93b7..717b148 100644 --- a/lib/libc/stdio/putw.c +++ b/lib/libc/stdio/putw.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)putw.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c index 59fc35c..a1e4e30 100644 --- a/lib/libc/stdio/refill.c +++ b/lib/libc/stdio/refill.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)refill.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <errno.h> diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c index 3518b68..b17124c 100644 --- a/lib/libc/stdio/remove.c +++ b/lib/libc/stdio/remove.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)remove.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c index 2db21c78..a9b91db 100644 --- a/lib/libc/stdio/rewind.c +++ b/lib/libc/stdio/rewind.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)rewind.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <errno.h> diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c index 030d410..9a0bd97 100644 --- a/lib/libc/stdio/rget.c +++ b/lib/libc/stdio/rget.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)rget.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include "local.h" diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c index fac6cee..98cd4e2 100644 --- a/lib/libc/stdio/scanf.c +++ b/lib/libc/stdio/scanf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)scanf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c index b07bce9..e6209fd 100644 --- a/lib/libc/stdio/setbuf.c +++ b/lib/libc/stdio/setbuf.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)setbuf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include "local.h" diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c index cb770be..ec77917 100644 --- a/lib/libc/stdio/setbuffer.c +++ b/lib/libc/stdio/setbuffer.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)setbuffer.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c index f416735..df88d24 100644 --- a/lib/libc/stdio/setvbuf.c +++ b/lib/libc/stdio/setvbuf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)setvbuf.c 8.2 (Berkeley) 11/16/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c index fe21129..0a09bac 100644 --- a/lib/libc/stdio/snprintf.c +++ b/lib/libc/stdio/snprintf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <stdio.h> diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c index a810096..075ac63 100644 --- a/lib/libc/stdio/sprintf.c +++ b/lib/libc/stdio/sprintf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)sprintf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #if __STDC__ diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c index 03808dd..5a9ada6 100644 --- a/lib/libc/stdio/sscanf.c +++ b/lib/libc/stdio/sscanf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)sscanf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <string.h> diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c index 0358f10..01d954d 100644 --- a/lib/libc/stdio/stdio.c +++ b/lib/libc/stdio/stdio.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)stdio.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <errno.h> diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c index c7780a4..8ac39ed 100644 --- a/lib/libc/stdio/tempnam.c +++ b/lib/libc/stdio/tempnam.c @@ -32,12 +32,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)tempnam.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <errno.h> diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c index 5aabe03..0c98ad3 100644 --- a/lib/libc/stdio/tmpfile.c +++ b/lib/libc/stdio/tmpfile.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)tmpfile.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c index bc996f8..7c75b54 100644 --- a/lib/libc/stdio/tmpnam.c +++ b/lib/libc/stdio/tmpnam.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)tmpnam.c 8.3 (Berkeley) 3/28/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c index 7eb10b1..9273d07 100644 --- a/lib/libc/stdio/ungetc.c +++ b/lib/libc/stdio/ungetc.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)ungetc.c 8.2 (Berkeley) 11/3/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c index 98180cb..bed79eb 100644 --- a/lib/libc/stdio/vasprintf.c +++ b/lib/libc/stdio/vasprintf.c @@ -27,9 +27,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) -static char rcsid[] = "$FreeBSD$"; -#endif /* LIBC_RCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 4902d8c..b723c67 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Actual printf innards. diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index c8644e8..4843162 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c index a3a2f63..ad38b45 100644 --- a/lib/libc/stdio/vprintf.c +++ b/lib/libc/stdio/vprintf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)vprintf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c index 64541c8..beed0c2 100644 --- a/lib/libc/stdio/vscanf.c +++ b/lib/libc/stdio/vscanf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)vscanf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdio.h> diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c index b301b08..cb0e15a 100644 --- a/lib/libc/stdio/vsnprintf.c +++ b/lib/libc/stdio/vsnprintf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <stdio.h> diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c index dbfd339..a3eebb3 100644 --- a/lib/libc/stdio/vsprintf.c +++ b/lib/libc/stdio/vsprintf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)vsprintf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <limits.h> diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c index d3f2fdd..6841fc4 100644 --- a/lib/libc/stdio/vsscanf.c +++ b/lib/libc/stdio/vsscanf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)vsscanf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <string.h> diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index a354345..9f4f096 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)wbuf.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include "local.h" diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c index be5c0a6..4039a11 100644 --- a/lib/libc/stdio/wsetup.c +++ b/lib/libc/stdio/wsetup.c @@ -35,12 +35,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)wsetup.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c index 0b85182..e85332a 100644 --- a/lib/libc/stdlib/abort.c +++ b/lib/libc/stdlib/abort.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)abort.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <signal.h> #include <stdlib.h> diff --git a/lib/libc/stdlib/abs.c b/lib/libc/stdlib/abs.c index 013fe53..0cca02b 100644 --- a/lib/libc/stdlib/abs.c +++ b/lib/libc/stdlib/abs.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)abs.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c index f5b57c4..8c3d103 100644 --- a/lib/libc/stdlib/atexit.c +++ b/lib/libc/stdlib/atexit.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)atexit.c 8.2 (Berkeley) 7/3/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stddef.h> diff --git a/lib/libc/stdlib/atof.c b/lib/libc/stdlib/atof.c index 0de674f..63a95b3 100644 --- a/lib/libc/stdlib/atof.c +++ b/lib/libc/stdlib/atof.c @@ -36,6 +36,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)atof.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> diff --git a/lib/libc/stdlib/atoi.c b/lib/libc/stdlib/atoi.c index 17c91c1..7190da7 100644 --- a/lib/libc/stdlib/atoi.c +++ b/lib/libc/stdlib/atoi.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)atoi.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> diff --git a/lib/libc/stdlib/atol.c b/lib/libc/stdlib/atol.c index d2e3c45..f4d8d1f 100644 --- a/lib/libc/stdlib/atol.c +++ b/lib/libc/stdlib/atol.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)atol.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> diff --git a/lib/libc/stdlib/atoll.c b/lib/libc/stdlib/atoll.c index a3c15a2..463677d 100644 --- a/lib/libc/stdlib/atoll.c +++ b/lib/libc/stdlib/atoll.c @@ -29,10 +29,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdlib.h> long long diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c index d7bde163..0c3c484 100644 --- a/lib/libc/stdlib/div.c +++ b/lib/libc/stdlib/div.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)div.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> /* div_t */ diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c index 8ed5844..78c5f36 100644 --- a/lib/libc/stdlib/exit.c +++ b/lib/libc/stdlib/exit.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)exit.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <stdlib.h> diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c index 873d443..0f9918d 100644 --- a/lib/libc/stdlib/getopt.c +++ b/lib/libc/stdlib/getopt.c @@ -32,11 +32,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; -#endif -static const char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c index ecc2431..d40bd95 100644 --- a/lib/libc/stdlib/hcreate.c +++ b/lib/libc/stdlib/hcreate.c @@ -1,5 +1,4 @@ /* $NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2001 Christopher G. Demetriou @@ -48,9 +47,12 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/queue.h> diff --git a/lib/libc/stdlib/labs.c b/lib/libc/stdlib/labs.c index 4adc398..36ae55d 100644 --- a/lib/libc/stdlib/labs.c +++ b/lib/libc/stdlib/labs.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)labs.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c index d458efd..37e95fa 100644 --- a/lib/libc/stdlib/ldiv.c +++ b/lib/libc/stdlib/ldiv.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ldiv.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> /* ldiv_t */ diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 463bbfc..202ac69 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -6,10 +6,11 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD$ - * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * Defining EXTRA_SANITY will enable extra checks which are related * to internal conditions and consistency in malloc.c. This has a diff --git a/lib/libc/stdlib/putenv.c b/lib/libc/stdlib/putenv.c index eb5e805..1aa9998 100644 --- a/lib/libc/stdlib/putenv.c +++ b/lib/libc/stdlib/putenv.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)putenv.c 8.2 (Berkeley) 3/27/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c index 11dd937..8e6cd61 100644 --- a/lib/libc/stdlib/qsort.c +++ b/lib/libc/stdlib/qsort.c @@ -32,12 +32,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)qsort.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c index 350556d..57e6bfa 100644 --- a/lib/libc/stdlib/rand.c +++ b/lib/libc/stdlib/rand.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. * * Posix rand_r function added May 1999 by Wes Peters <wes@softweyr.com>. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rand.c 8.1 (Berkeley) 6/14/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/time.h> /* for sranddev() */ #include <sys/types.h> diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c index 9db04aa..b3a1e11 100644 --- a/lib/libc/stdlib/random.c +++ b/lib/libc/stdlib/random.c @@ -29,14 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ - * */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)random.c 8.2 (Berkeley) 5/19/95"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/time.h> /* for srandomdev() */ diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c index e9327e6..5320926 100644 --- a/lib/libc/stdlib/reallocf.c +++ b/lib/libc/stdlib/reallocf.c @@ -22,9 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdlib.h> void * diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c index 2bb8c89..da6f1e2 100644 --- a/lib/libc/stdlib/realpath.c +++ b/lib/libc/stdlib/realpath.c @@ -32,13 +32,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)realpath.c 8.1 (Berkeley) 2/16/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/param.h> diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c index e1de805..5c6d906 100644 --- a/lib/libc/stdlib/setenv.c +++ b/lib/libc/stdlib/setenv.c @@ -32,11 +32,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)setenv.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stddef.h> #include <stdlib.h> diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c index 99c7aba..0a72ca8 100644 --- a/lib/libc/stdlib/strfmon.c +++ b/lib/libc/stdlib/strfmon.c @@ -25,9 +25,8 @@ * */ -#if defined(LIBC_RCS) && !defined(lint) -static char rcsid[] = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <ctype.h> diff --git a/lib/libc/stdlib/strhash.c b/lib/libc/stdlib/strhash.c index 8da9064..ab9d756 100644 --- a/lib/libc/stdlib/strhash.c +++ b/lib/libc/stdlib/strhash.c @@ -1,8 +1,3 @@ -#ifndef lint -static const char *rcsid = -"$FreeBSD$"; -#endif - /* * * Copyright 1990 @@ -72,6 +67,8 @@ static const char *rcsid = * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> diff --git a/lib/libc/stdlib/strtod.c b/lib/libc/stdlib/strtod.c index 0af4932..1ec688f 100644 --- a/lib/libc/stdlib/strtod.c +++ b/lib/libc/stdlib/strtod.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtod.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /**************************************************************** * diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c index 00c252c..5f86e3a 100644 --- a/lib/libc/stdlib/strtoimax.c +++ b/lib/libc/stdlib/strtoimax.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "from @(#)strtol.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <errno.h> diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c index 622f1d8..265b01e 100644 --- a/lib/libc/stdlib/strtol.c +++ b/lib/libc/stdlib/strtol.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtol.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <ctype.h> diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c index 552a59b..f0c245f 100644 --- a/lib/libc/stdlib/strtoll.c +++ b/lib/libc/stdlib/strtoll.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtoq.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <errno.h> diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c index 10b674b..78c1b08 100644 --- a/lib/libc/stdlib/strtoq.c +++ b/lib/libc/stdlib/strtoq.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtoq.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c index 487f8c0..ba23bd0 100644 --- a/lib/libc/stdlib/strtoul.c +++ b/lib/libc/stdlib/strtoul.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <ctype.h> diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c index 09bd8b4..bda9e30 100644 --- a/lib/libc/stdlib/strtoull.c +++ b/lib/libc/stdlib/strtoull.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtouq.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <errno.h> diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c index 3d34c3b..503fb6b 100644 --- a/lib/libc/stdlib/strtoumax.c +++ b/lib/libc/stdlib/strtoumax.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "from @(#)strtoul.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <errno.h> diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c index d5e992a..8b3e30e 100644 --- a/lib/libc/stdlib/strtouq.c +++ b/lib/libc/stdlib/strtouq.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtouq.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c index 28c9617..ac14ae9 100644 --- a/lib/libc/stdlib/system.c +++ b/lib/libc/stdlib/system.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)system.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/types.h> diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c index 339405a..32dc298 100644 --- a/lib/libc/stdlib/tdelete.c +++ b/lib/libc/stdlib/tdelete.c @@ -1,5 +1,4 @@ /* $NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $ */ -/* $FreeBSD$ */ /* * Tree search generalized from Knuth (6.2.2) Algorithm T just like @@ -13,9 +12,12 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #define _SEARCH_PRIVATE diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c index c2e3d77..18e0a30 100644 --- a/lib/libc/stdlib/tfind.c +++ b/lib/libc/stdlib/tfind.c @@ -1,5 +1,4 @@ /* $NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $ */ -/* $FreeBSD$ */ /* * Tree search generalized from Knuth (6.2.2) Algorithm T just like @@ -13,9 +12,12 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #define _SEARCH_PRIVATE diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c index e842ff4..5d85931 100644 --- a/lib/libc/stdlib/tsearch.c +++ b/lib/libc/stdlib/tsearch.c @@ -1,5 +1,4 @@ /* $NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $ */ -/* $FreeBSD$ */ /* * Tree search generalized from Knuth (6.2.2) Algorithm T just like @@ -13,9 +12,12 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #define _SEARCH_PRIVATE diff --git a/lib/libc/stdlib/twalk.c b/lib/libc/stdlib/twalk.c index 78be57d..49f474e 100644 --- a/lib/libc/stdlib/twalk.c +++ b/lib/libc/stdlib/twalk.c @@ -1,5 +1,4 @@ /* $NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $ */ -/* $FreeBSD$ */ /* * Tree search generalized from Knuth (6.2.2) Algorithm T just like @@ -13,9 +12,12 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #define _SEARCH_PRIVATE diff --git a/lib/libc/stdtime/asctime.c b/lib/libc/stdtime/asctime.c index 06df9a7..49cbc1d 100644 --- a/lib/libc/stdtime/asctime.c +++ b/lib/libc/stdtime/asctime.c @@ -1,8 +1,6 @@ /* ** This file is in the public domain, so clarified as of ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov). -* -* $FreeBSD$ */ #ifndef lint @@ -10,6 +8,8 @@ static char elsieid[] = "@(#)asctime.c 7.7"; #endif /* !defined NOID */ #endif /* !defined lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /*LINTLIBRARY*/ diff --git a/lib/libc/stdtime/difftime.c b/lib/libc/stdtime/difftime.c index 64a5ea2..59368e4 100644 --- a/lib/libc/stdtime/difftime.c +++ b/lib/libc/stdtime/difftime.c @@ -1,8 +1,6 @@ /* ** This file is in the public domain, so clarified as of ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov). -* -* $FreeBSD$ */ #ifndef lint @@ -10,6 +8,8 @@ static char elsieid[] = "@(#)difftime.c 7.7"; #endif /* !defined NOID */ #endif /* !defined lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /*LINTLIBRARY*/ diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c index 28a7b68..09cfd3f 100644 --- a/lib/libc/stdtime/localtime.c +++ b/lib/libc/stdtime/localtime.c @@ -1,8 +1,6 @@ /* ** This file is in the public domain, so clarified as of ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov). -** -** $FreeBSD$ */ #ifndef lint @@ -10,6 +8,8 @@ static char elsieid[] = "@(#)localtime.c 7.57"; #endif /* !defined NOID */ #endif /* !defined lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu). diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c index 72f67d4..29401bb 100644 --- a/lib/libc/stdtime/strftime.c +++ b/lib/libc/stdtime/strftime.c @@ -15,11 +15,6 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifdef LIBC_RCS -static const char rcsid[] = - "$FreeBSD$"; -#endif - #ifndef lint #ifndef NOID static const char elsieid[] = "@(#)strftime.c 7.38"; @@ -33,11 +28,11 @@ static const char elsieid[] = "@(#)strftime.c 7.38"; #include "namespace.h" #include "private.h" -#ifndef LIBC_SCCS -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)strftime.c 5.4 (Berkeley) 3/14/89"; -#endif /* !defined lint */ -#endif /* !defined LIBC_SCCS */ +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "tzfile.h" #include <fcntl.h> diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c index bcda42b..b050f1a 100644 --- a/lib/libc/stdtime/strptime.c +++ b/lib/libc/stdtime/strptime.c @@ -51,11 +51,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef LIBC_RCS -static const char rcsid[] = - "$FreeBSD$"; -#endif - #ifndef lint #ifndef NOID static char copyright[] = @@ -63,6 +58,8 @@ static char copyright[] = static char sccsid[] = "@(#)strptime.c 0.1 (Powerdog) 94/03/27"; #endif /* !defined NOID */ #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <time.h> diff --git a/lib/libc/stdtime/time32.c b/lib/libc/stdtime/time32.c index 34174c5..9040fdc 100644 --- a/lib/libc/stdtime/time32.c +++ b/lib/libc/stdtime/time32.c @@ -9,10 +9,11 @@ * * Redistribution and use under the terms of the COPYRIGHT file at the * base of the source tree. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/time.h> @@ -97,4 +98,3 @@ _int_to_time(int tint) return(_time32_to_time(tint)); return((time_t)tint); } - diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c index 48c4b8a..e1fffcb 100644 --- a/lib/libc/stdtime/timelocal.c +++ b/lib/libc/stdtime/timelocal.c @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stddef.h> #include "ldpart.h" diff --git a/lib/libc/string/bzero.c b/lib/libc/string/bzero.c index 7bc2b3a..201bd64 100644 --- a/lib/libc/string/bzero.c +++ b/lib/libc/string/bzero.c @@ -1,2 +1,5 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #define BZERO #include "memset.c" diff --git a/lib/libc/string/memcpy.c b/lib/libc/string/memcpy.c index ee11504..ed03856 100644 --- a/lib/libc/string/memcpy.c +++ b/lib/libc/string/memcpy.c @@ -1,2 +1,5 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #define MEMCOPY #include "bcopy.c" diff --git a/lib/libc/string/memmove.c b/lib/libc/string/memmove.c index e9bb2c2..05cf75a 100644 --- a/lib/libc/string/memmove.c +++ b/lib/libc/string/memmove.c @@ -1,2 +1,5 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #define MEMMOVE #include "bcopy.c" diff --git a/lib/libc/string/strchr.c b/lib/libc/string/strchr.c index ee33662..1d82abe 100644 --- a/lib/libc/string/strchr.c +++ b/lib/libc/string/strchr.c @@ -1,2 +1,5 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #define STRCHR #include "index.c" diff --git a/lib/libc/string/strrchr.c b/lib/libc/string/strrchr.c index 8fcf3a1..11cbd31 100644 --- a/lib/libc/string/strrchr.c +++ b/lib/libc/string/strrchr.c @@ -1,2 +1,5 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #define STRRCHR #include "rindex.c" diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c index 11e63c1..e17e904 100644 --- a/lib/libc/string/strtok.c +++ b/lib/libc/string/strtok.c @@ -36,14 +36,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#if 0 #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strtok.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stddef.h> #ifdef DEBUG_STRTOK diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c index 391ca94..62752ee 100644 --- a/lib/libc/string/wcscat.c +++ b/lib/libc/string/wcscat.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c index ad713f9..eb26743 100644 --- a/lib/libc/string/wcschr.c +++ b/lib/libc/string/wcschr.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcschr.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c index f25479c..26ea03d 100644 --- a/lib/libc/string/wcscmp.c +++ b/lib/libc/string/wcscmp.c @@ -37,7 +37,9 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93"; +#if 0 __RCSID("$NetBSD$"); +#endif #endif /* LIBC_SCCS and not lint */ __FBSDID("$FreeBSD$"); diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c index 890d27a..fbe56d6 100644 --- a/lib/libc/string/wcscpy.c +++ b/lib/libc/string/wcscpy.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c index 334b60b..1035cb0 100644 --- a/lib/libc/string/wcscspn.c +++ b/lib/libc/string/wcscspn.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c index fd81fca..9edfbdb 100644 --- a/lib/libc/string/wcslcat.c +++ b/lib/libc/string/wcslcat.c @@ -28,9 +28,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c index 1cde15f..575b264 100644 --- a/lib/libc/string/wcslcpy.c +++ b/lib/libc/string/wcslcpy.c @@ -28,9 +28,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c index 852a829..82ff51b 100644 --- a/lib/libc/string/wcslen.c +++ b/lib/libc/string/wcslen.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c index c4103c5..11e0281 100644 --- a/lib/libc/string/wcsncat.c +++ b/lib/libc/string/wcsncat.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c index 01d995c..81bc86c 100644 --- a/lib/libc/string/wcsncmp.c +++ b/lib/libc/string/wcsncmp.c @@ -32,10 +32,12 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93"; __RCSID("$NetBSD$"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c index 1660bbc..8f15565 100644 --- a/lib/libc/string/wcsncpy.c +++ b/lib/libc/string/wcsncpy.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsncpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c index e2d24a7..2a24d05 100644 --- a/lib/libc/string/wcspbrk.c +++ b/lib/libc/string/wcspbrk.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c index 9636575..b7b236b 100644 --- a/lib/libc/string/wcsrchr.c +++ b/lib/libc/string/wcsrchr.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsrchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c index 42dd1e6..7fc996a 100644 --- a/lib/libc/string/wcsspn.c +++ b/lib/libc/string/wcsspn.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c index 1f7137d..546ae9b 100644 --- a/lib/libc/string/wcsstr.c +++ b/lib/libc/string/wcsstr.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsstr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c index e484dac..84dc42b 100644 --- a/lib/libc/string/wcswidth.c +++ b/lib/libc/string/wcswidth.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcswidth.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c index 61fa4a2..2aaec09 100644 --- a/lib/libc/string/wmemchr.c +++ b/lib/libc/string/wmemchr.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c index d47c332..4491cf0 100644 --- a/lib/libc/string/wmemcmp.c +++ b/lib/libc/string/wmemcmp.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c index 14888be..787e07c 100644 --- a/lib/libc/string/wmemcpy.c +++ b/lib/libc/string/wmemcpy.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c index ef37044..e4e80b2 100644 --- a/lib/libc/string/wmemmove.c +++ b/lib/libc/string/wmemmove.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c index 569b65d..1680cdb 100644 --- a/lib/libc/string/wmemset.c +++ b/lib/libc/string/wmemset.c @@ -27,9 +27,11 @@ */ #include <sys/cdefs.h> +#if 0 #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ +#endif __FBSDID("$FreeBSD$"); #include <assert.h> diff --git a/lib/libc/sys/__error.c b/lib/libc/sys/__error.c index 3641e77..8dcf894 100644 --- a/lib/libc/sys/__error.c +++ b/lib/libc/sys/__error.c @@ -28,11 +28,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); extern int errno; diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c index da81b43..28acc58 100644 --- a/lib/libc/sys/ftruncate.c +++ b/lib/libc/sys/ftruncate.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ftruncate.c 8.1 (Berkeley) 6/17/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/syscall.h> diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c index 230940c..3544fbf 100644 --- a/lib/libc/sys/lseek.c +++ b/lib/libc/sys/lseek.c @@ -29,13 +29,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)lseek.c 8.1 (Berkeley) 6/17/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/syscall.h> diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c index 32aeffb..4efce17 100644 --- a/lib/libc/sys/mmap.c +++ b/lib/libc/sys/mmap.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mmap.c 8.1 (Berkeley) 6/17/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/mman.h> diff --git a/lib/libc/sys/pread.c b/lib/libc/sys/pread.c index b639383..c1a9136 100644 --- a/lib/libc/sys/pread.c +++ b/lib/libc/sys/pread.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mmap.c 8.1 (Berkeley) 6/17/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/syscall.h> diff --git a/lib/libc/sys/pwrite.c b/lib/libc/sys/pwrite.c index 6fb3c5a..e6969cd 100644 --- a/lib/libc/sys/pwrite.c +++ b/lib/libc/sys/pwrite.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mmap.c 8.1 (Berkeley) 6/17/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/syscall.h> diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c index 5bfeeb6..cedfd5b 100644 --- a/lib/libc/sys/truncate.c +++ b/lib/libc/sys/truncate.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)truncate.c 8.1 (Berkeley) 6/17/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/syscall.h> diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 113ac3c..fcb1a51 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -29,12 +29,12 @@ * Mountain View, California 94043 */ -#include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)xdr.c 1.35 87/08/12";*/ -/*static char *sccsid = "from: @(#)xdr.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$FreeBSD$"; +static char *sccsid = "@(#)xdr.c 1.35 87/08/12"; +static char *sccsid = "@(#)xdr.c 2.1 88/07/29 4.0 RPCSRC"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * xdr.c, Generic XDR routines implementation. diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c index 8e0a302..d75c53f 100644 --- a/lib/libc/xdr/xdr_array.c +++ b/lib/libc/xdr/xdr_array.c @@ -29,12 +29,12 @@ * Mountain View, California 94043 */ -#include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";*/ -/*static char *sccsid = "from: @(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$FreeBSD$"; +static char *sccsid = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * xdr_array.c, Generic XDR routines impelmentation. diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c index 0e5e988..4c45fff 100644 --- a/lib/libc/xdr/xdr_float.c +++ b/lib/libc/xdr/xdr_float.c @@ -29,12 +29,12 @@ * Mountain View, California 94043 */ -#include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) static char *sccsid = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC"; -static char *rcsid = "$FreeBSD$"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * xdr_float.c, Generic XDR routines implementation. diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c index 1faf0191..19ed188 100644 --- a/lib/libc/xdr/xdr_mem.c +++ b/lib/libc/xdr/xdr_mem.c @@ -29,12 +29,12 @@ * Mountain View, California 94043 */ -#include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/ -/*static char *sccsid = "from: @(#)xdr_mem.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$FreeBSD$"; +static char *sccsid = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid = "@(#)xdr_mem.c 2.1 88/07/29 4.0 RPCSRC"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * xdr_mem.h, XDR implementation using memory buffers. diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c index 3ab2667..3b85c00 100644 --- a/lib/libc/xdr/xdr_rec.c +++ b/lib/libc/xdr/xdr_rec.c @@ -31,10 +31,11 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/ -/*static char *sccsid = "from: @(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char *rcsid = "$FreeBSD$"; +static char *sccsid = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid = "@(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking" diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c index 27f09c9..0a0b19d 100644 --- a/lib/libc/xdr/xdr_reference.c +++ b/lib/libc/xdr/xdr_reference.c @@ -31,10 +31,12 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)xdr_reference.c 1.11 87/08/11 SMI";*/ -/*static char *sccsid = "from: @(#)xdr_reference.c 2.1 88/07/29 4.0 RPCSRC";*/ +static char *sccsid = "@(#)xdr_reference.c 1.11 87/08/11 SMI"; +static char *sccsid = "@(#)xdr_reference.c 2.1 88/07/29 4.0 RPCSRC"; static char *rcsid = "$FreeBSD$"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * xdr_reference.c, Generic XDR routines impelmentation. diff --git a/lib/libc/xdr/xdr_sizeof.c b/lib/libc/xdr/xdr_sizeof.c index f90cc34..b487db8 100644 --- a/lib/libc/xdr/xdr_sizeof.c +++ b/lib/libc/xdr/xdr_sizeof.c @@ -1,6 +1,4 @@ /* - * $FreeBSD$ - * * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape * media and as a part of the software program in whole or part. Users @@ -37,6 +35,9 @@ * when serialized using XDR. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "namespace.h" #include <rpc/types.h> #include <rpc/xdr.h> diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c index 3cf485c..a8e10eb 100644 --- a/lib/libc/xdr/xdr_stdio.c +++ b/lib/libc/xdr/xdr_stdio.c @@ -29,12 +29,12 @@ * Mountain View, California 94043 */ -#include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";*/ -/*static char *sccsid = "from: @(#)xdr_stdio.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$FreeBSD$"; +static char *sccsid = "@(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid = "@(#)xdr_stdio.c 2.1 88/07/29 4.0 RPCSRC"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * xdr_stdio.c, XDR implementation on standard i/o file. diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c index 630180c..38aa8e2 100644 --- a/lib/libc/yp/xdryp.c +++ b/lib/libc/yp/xdryp.c @@ -27,9 +27,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <rpc/rpc.h> #include <rpcsvc/yp.h> diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c index 9f9ffba..a9d2d13 100644 --- a/lib/libc/yp/yplib.c +++ b/lib/libc/yp/yplib.c @@ -28,9 +28,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/param.h> |
