[Midnightbsd-cvs] src: libc/gen: Remove advertising clause per letter.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon May 12 21:31:08 EDT 2008
Log Message:
-----------
Remove advertising clause per letter. Modernize the C code, I don't feel like maintaining this crap.
Modified Files:
--------------
src/lib/libc/gen:
__xuname.c (r1.1.1.1 -> r1.2)
_pthread_stubs.c (r1.1.1.1 -> r1.2)
_rand48.c (r1.1.1.1 -> r1.2)
_spinlock_stub.c (r1.1.1.1 -> r1.2)
_thread_init.c (r1.1.1.1 -> r1.2)
alarm.3 (r1.1.1.1 -> r1.2)
alarm.c (r1.1.1.1 -> r1.2)
arc4random.3 (r1.1.1.1 -> r1.2)
arc4random.c (r1.1.1.1 -> r1.2)
assert.c (r1.1.1.1 -> r1.2)
basename.3 (r1.1.1.1 -> r1.2)
basename.c (r1.1.1.1 -> r1.2)
check_utility_compat.3 (r1.1.1.1 -> r1.2)
check_utility_compat.c (r1.1.1.1 -> r1.2)
clock.3 (r1.1.1.1 -> r1.2)
clock.c (r1.1.1.1 -> r1.2)
closedir.c (r1.1.1.1 -> r1.2)
confstr.3 (r1.1.1.1 -> r1.2)
confstr.c (r1.1.1.1 -> r1.2)
crypt.c (r1.1.1.1 -> r1.2)
ctermid.3 (r1.1.1.1 -> r1.2)
ctermid.c (r1.1.1.1 -> r1.2)
daemon.3 (r1.1.1.1 -> r1.2)
daemon.c (r1.1.1.1 -> r1.2)
devname.3 (r1.1.1.1 -> r1.2)
devname.c (r1.1.1.1 -> r1.2)
directory.3 (r1.1.1.1 -> r1.2)
dirname.3 (r1.1.1.1 -> r1.2)
dirname.c (r1.1.1.1 -> r1.2)
disklabel.c (r1.1.1.1 -> r1.2)
dladdr.3 (r1.1.1.1 -> r1.2)
dlfcn.c (r1.1.1.1 -> r1.2)
dlfunc.c (r1.1.1.1 -> r1.2)
dlinfo.3 (r1.1.1.1 -> r1.2)
dllockinit.3 (r1.1.1.1 -> r1.2)
dlopen.3 (r1.1.1.1 -> r1.2)
drand48.c (r1.1.1.1 -> r1.2)
erand48.c (r1.1.1.1 -> r1.2)
err.3 (r1.1.1.1 -> r1.2)
err.c (r1.1.1.1 -> r1.2)
errlst.c (r1.1.1.1 -> r1.2)
errno.c (r1.1.1.1 -> r1.2)
exec.3 (r1.1.1.1 -> r1.2)
exec.c (r1.1.1.1 -> r1.2)
-------------- next part --------------
Index: directory.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/directory.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/directory.3 -L lib/libc/gen/directory.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/directory.3
+++ lib/libc/gen/directory.3
@@ -9,10 +9,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -31,6 +27,7 @@
.\"
.\" @(#)directory.3 8.1 (Berkeley) 6/4/93
.\" $FreeBSD: src/lib/libc/gen/directory.3,v 1.15 2004/07/03 22:30:08 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd June 4, 1993
.Dt DIRECTORY 3
Index: ctermid.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/ctermid.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/ctermid.3 -L lib/libc/gen/ctermid.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/ctermid.3
+++ lib/libc/gen/ctermid.3
@@ -9,10 +9,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -31,6 +27,7 @@
.\"
.\" @(#)ctermid.3 8.1 (Berkeley) 6/4/93
.\" $FreeBSD: src/lib/libc/gen/ctermid.3,v 1.11 2003/09/08 19:57:14 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd June 4, 1993
.Dt CTERMID 3
Index: errno.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/errno.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/errno.c -L lib/libc/gen/errno.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/errno.c
+++ lib/libc/gen/errno.c
@@ -25,6 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errno.c,v 1.1 2002/10/09 08:04:24 peter Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/errno.c,v 1.1 2002/10/09 08:04:24 peter Exp $"); */
+__MBSDID("$MidnightBSD$");
int errno;
Index: dlinfo.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/dlinfo.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/dlinfo.3 -L lib/libc/gen/dlinfo.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/dlinfo.3
+++ lib/libc/gen/dlinfo.3
@@ -24,6 +24,7 @@
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.9 2005/01/20 09:17:02 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd February 14, 2003
.Os
Index: devname.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/devname.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/devname.3 -L lib/libc/gen/devname.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/devname.3
+++ lib/libc/gen/devname.3
@@ -9,10 +9,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -31,6 +27,7 @@
.\"
.\" @(#)devname.3 8.2 (Berkeley) 4/29/95
.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.18 2005/02/23 02:02:38 trhodes Exp $
+.\" $MidnightBSD$
.\"
.Dd February 22, 2005
.Dt DEVNAME 3
Index: clock.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/clock.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/clock.c -L lib/libc/gen/clock.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/clock.c
+++ lib/libc/gen/clock.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)clock.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)clock.c 8.1 (Berkeley) 6/4/93"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/clock.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
+/* __FBSDID("$FreeBSD: src/lib/libc/gen/clock.c,v 1.3 2002/03/22 21:52:05 obrien Exp $"); */
+__MBSDID("$MidnightBSD$");
#include <sys/param.h>
#include <sys/time.h>
Index: errlst.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/errlst.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/errlst.c -L lib/libc/gen/errlst.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/errlst.c
+++ lib/libc/gen/errlst.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)errlst.c 8.2 (Berkeley) 11/16/93";
-#endif /* LIBC_SCCS and not lint */
+/*static char sccsid[] = "@(#)errlst.c 8.2 (Berkeley) 11/16/93";*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.8 2005/04/02 12:33:28 das Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.8 2005/04/02 12:33:28 das Exp $");*/
+__MBSDID("$MidnightBSD$");
#include <stdio.h>
Index: drand48.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/drand48.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/drand48.c -L lib/libc/gen/drand48.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/drand48.c
+++ lib/libc/gen/drand48.c
@@ -12,7 +12,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/drand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/drand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");*/
+__MBSDID("$MidnightBSD$");
#include "rand48.h"
Index: daemon.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/daemon.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/daemon.c -L lib/libc/gen/daemon.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/daemon.c
+++ lib/libc/gen/daemon.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)daemon.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)daemon.c 8.1 (Berkeley) 6/4/93"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/daemon.c,v 1.6 2003/11/10 22:01:42 ghelmer Exp $");
+/* __FBSDID("$FreeBSD: src/lib/libc/gen/daemon.c,v 1.6 2003/11/10 22:01:42 ghelmer Exp $"); */
+__MBSDID("$MidnightBSD$");
#include "namespace.h"
#include <errno.h>
@@ -46,8 +41,7 @@
#include "un-namespace.h"
int
-daemon(nochdir, noclose)
- int nochdir, noclose;
+daemon(int nochdir, int noclose)
{
struct sigaction osa, sa;
int fd;
Index: _pthread_stubs.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/_pthread_stubs.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/_pthread_stubs.c -L lib/libc/gen/_pthread_stubs.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/_pthread_stubs.c
+++ lib/libc/gen/_pthread_stubs.c
@@ -25,7 +25,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.11 2004/07/29 18:07:08 kan Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.11 2004/07/29 18:07:08 kan Exp $"); */
+__MBSDID("$MidnightBSD$");
#include <signal.h>
#include <pthread.h>
Index: exec.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/exec.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/exec.3 -L lib/libc/gen/exec.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/exec.3
+++ lib/libc/gen/exec.3
@@ -9,10 +9,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -31,6 +27,7 @@
.\"
.\" @(#)exec.3 8.3 (Berkeley) 1/24/94
.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.25 2005/02/13 22:25:12 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd January 24, 1994
.Dt EXEC 3
Index: __xuname.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/__xuname.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/__xuname.c -L lib/libc/gen/__xuname.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/__xuname.c
+++ lib/libc/gen/__xuname.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,12 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
/*static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";*/
-#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.9 2002/02/01 00:57:29 obrien Exp $");
-
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.9 2002/02/01 00:57:29 obrien Exp $"); */
+__MBSDID("$MidnightBSD$");
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/utsname.h>
Index: dllockinit.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/dllockinit.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/dllockinit.3 -L lib/libc/gen/dllockinit.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/dllockinit.3
+++ lib/libc/gen/dllockinit.3
@@ -24,6 +24,7 @@
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD: src/lib/libc/gen/dllockinit.3,v 1.14 2004/07/02 23:52:10 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd July 5, 2000
.Os
Index: confstr.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/confstr.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/confstr.3 -L lib/libc/gen/confstr.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/confstr.3
+++ lib/libc/gen/confstr.3
@@ -9,10 +9,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -31,6 +27,7 @@
.\"
.\" @(#)confstr.3 8.1 (Berkeley) 6/4/93
.\" $FreeBSD: src/lib/libc/gen/confstr.3,v 1.13 2003/09/08 19:57:14 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd June 18, 2001
.Dt CONFSTR 3
Index: basename.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/basename.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/basename.3 -L lib/libc/gen/basename.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/basename.3
+++ lib/libc/gen/basename.3
@@ -26,6 +26,7 @@
.\"
.\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $
.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.7 2004/07/02 23:52:10 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd August 17, 1997
.Dt BASENAME 3
Index: dladdr.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/dladdr.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/dladdr.3 -L lib/libc/gen/dladdr.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/dladdr.3
+++ lib/libc/gen/dladdr.3
@@ -24,6 +24,7 @@
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD: src/lib/libc/gen/dladdr.3,v 1.8 2004/07/02 23:52:10 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd February 5, 1998
.Os
Index: devname.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/devname.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/devname.c -L lib/libc/gen/devname.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/devname.c
+++ lib/libc/gen/devname.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.9 2003/06/20 09:52:27 phk Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.9 2003/06/20 09:52:27 phk Exp $"); */
+__MBSDID("$MidnightBSD$");
#include <sys/types.h>
#include <sys/sysctl.h>
Index: daemon.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/daemon.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/daemon.3 -L lib/libc/gen/daemon.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/daemon.3
+++ lib/libc/gen/daemon.3
@@ -9,10 +9,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -31,6 +27,7 @@
.\"
.\" @(#)daemon.3 8.1 (Berkeley) 6/9/93
.\" $FreeBSD: src/lib/libc/gen/daemon.3,v 1.14 2003/11/10 22:04:51 ghelmer Exp $
+.\" $MidnightBSD$
.\"
.Dd June 9, 1993
.Dt DAEMON 3
Index: alarm.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/alarm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/alarm.c -L lib/libc/gen/alarm.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/alarm.c
+++ lib/libc/gen/alarm.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)alarm.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)alarm.c 8.1 (Berkeley) 6/4/93"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/alarm.c,v 1.2 2002/02/01 01:08:47 obrien Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/alarm.c,v 1.2 2002/02/01 01:08:47 obrien Exp $");*/
+__MBSDID("$MidnightBSD$");
/*
* Backwards compatible alarm.
@@ -43,9 +38,8 @@
#include <sys/time.h>
#include <unistd.h>
-unsigned int
-alarm(secs)
- unsigned int secs;
+unsigned int
+alarm(unsigned int secs)
{
struct itimerval it, oitv;
struct itimerval *itp =
Index: crypt.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/crypt.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/crypt.c -L lib/libc/gen/crypt.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/crypt.c
+++ lib/libc/gen/crypt.c
@@ -34,12 +34,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
/* from static char sccsid[] = "@(#)crypt.c 5.11 (Berkeley) 6/25/91"; */
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/crypt.c,v 1.8 2002/10/18 16:24:20 markm Exp $");
+/* __FBSDID("$FreeBSD: src/lib/libc/gen/crypt.c,v 1.8 2002/10/18 16:24:20 markm Exp $"); */
+__MBSDID("$MidnightBSD$");
#include <stdio.h>
#include <string.h>
Index: _thread_init.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/_thread_init.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/_thread_init.c -L lib/libc/gen/_thread_init.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/_thread_init.c
+++ lib/libc/gen/_thread_init.c
@@ -25,8 +25,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_thread_init.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
-
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/_thread_init.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");*/
+__MBSDID("$MidnightBSD");
#include <sys/types.h>
__weak_reference(_thread_init_stub, _thread_init);
Index: dlfunc.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/dlfunc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/dlfunc.c -L lib/libc/gen/dlfunc.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/dlfunc.c
+++ lib/libc/gen/dlfunc.c
@@ -3,6 +3,7 @@
* Garrett A. Wollman, 2002-05-28.
*
* $FreeBSD: src/lib/libc/gen/dlfunc.c,v 1.3 2002/09/11 05:05:48 mike Exp $
+ * $MidnightBSD$
*/
#include <dlfcn.h>
Index: arc4random.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/arc4random.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/arc4random.3 -L lib/libc/gen/arc4random.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/arc4random.3
+++ lib/libc/gen/arc4random.3
@@ -29,6 +29,7 @@
.\"
.\" Manual page, using -mandoc macros
.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.16 2003/07/31 06:18:24 das Exp $
+.\" $MidnightBSD$
.\"
.Dd April 15, 1997
.Dt ARC4RANDOM 3
Index: err.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/err.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/err.3 -L lib/libc/gen/err.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/err.3
+++ lib/libc/gen/err.3
@@ -9,10 +9,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -31,6 +27,7 @@
.\"
.\" From: @(#)err.3 8.1 (Berkeley) 6/9/93
.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.20 2004/10/04 14:04:37 jkoshy Exp $
+.\" $MidnightBSD$
.\"
.Dd March 6, 1999
.Dt ERR 3
Index: dirname.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/dirname.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/dirname.3 -L lib/libc/gen/dirname.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/dirname.3
+++ lib/libc/gen/dirname.3
@@ -26,6 +26,7 @@
.\"
.\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $
.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.8 2004/07/02 23:52:10 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd August 17, 1997
.Dt DIRNAME 3
Index: basename.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/basename.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/basename.c -L lib/libc/gen/basename.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/basename.c
+++ lib/libc/gen/basename.c
@@ -25,13 +25,10 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
-#endif /* not lint */
-#endif
+/* static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp $"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
+/* __FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $"); */
+__MBSDID("$MidnightBSD$");
#include <errno.h>
#include <libgen.h>
@@ -40,8 +37,7 @@
#include <sys/param.h>
char *
-basename(path)
- const char *path;
+basename(const char *path)
{
static char *bname = NULL;
const char *endp, *startp;
Index: exec.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/exec.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/exec.c -L lib/libc/gen/exec.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/exec.c
+++ lib/libc/gen/exec.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.22 2003/07/01 12:30:03 bde Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.22 2003/07/01 12:30:03 bde Exp $");*/
+__MBSDID("$MidnightBSD$");
#include "namespace.h"
#include <sys/param.h>
@@ -133,9 +128,7 @@
}
int
-execv(name, argv)
- const char *name;
- char * const *argv;
+execv(const char *name, char * const *argv)
{
(void)_execve(name, argv, environ);
return (-1);
@@ -154,10 +147,7 @@
}
int
-execvP(name, path, argv)
- const char *name;
- const char *path;
- char * const *argv;
+execvP(const char *name, const char *path, char * const *argv)
{
char **memp;
int cnt, lp, ln;
Index: assert.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/assert.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/assert.c -L lib/libc/gen/assert.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/assert.c
+++ lib/libc/gen/assert.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,21 +27,17 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)assert.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)assert.c 8.1 (Berkeley) 6/4/93"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/assert.c,v 1.7 2002/02/01 00:57:29 obrien Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/assert.c,v 1.7 2002/02/01 00:57:29 obrien Exp $"); */
+__MBSDID("$MidnightBSD$");
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
void
-__assert(func, file, line, failedexpr)
- const char *func, *file;
- int line;
- const char *failedexpr;
+__assert(const char *func, const char *file, int line, const char *failedexpr)
{
if (func == NULL)
(void)fprintf(stderr,
Index: check_utility_compat.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/check_utility_compat.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/check_utility_compat.c -L lib/libc/gen/check_utility_compat.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/check_utility_compat.c
+++ lib/libc/gen/check_utility_compat.c
@@ -28,7 +28,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.3 2003/05/01 19:03:13 nectar Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.3 2003/05/01 19:03:13 nectar Exp $");*/
+__MBSDID("$MidnightBSD$");
/*
* I din't use "namespace.h" here because none of the relevant utilities
Index: ctermid.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/ctermid.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/ctermid.c -L lib/libc/gen/ctermid.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/ctermid.c
+++ lib/libc/gen/ctermid.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ctermid.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)ctermid.c 8.1 (Berkeley) 6/4/93"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/ctermid.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/ctermid.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");*/
+__MBSDID("$MidnightBSD$");
#include <stdio.h>
#include <paths.h>
Index: dlopen.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/dlopen.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/dlopen.3 -L lib/libc/gen/dlopen.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/dlopen.3
+++ lib/libc/gen/dlopen.3
@@ -31,6 +31,7 @@
.\"
.\" @(#) dlopen.3 1.6 90/01/31 SMI
.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.28 2004/06/03 10:13:26 roam Exp $
+.\" $MidnightBSD$
.\"
.Dd September 10, 2002
.Os
Index: confstr.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/confstr.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/confstr.c -L lib/libc/gen/confstr.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/confstr.c
+++ lib/libc/gen/confstr.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)confstr.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)confstr.c 8.1 (Berkeley) 6/4/93"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.9 2003/05/01 19:03:13 nectar Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.9 2003/05/01 19:03:13 nectar Exp $"); */
+__MBSDID("$MidnightBSD$");
#include <sys/param.h>
Index: _spinlock_stub.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/_spinlock_stub.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/_spinlock_stub.c -L lib/libc/gen/_spinlock_stub.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/_spinlock_stub.c
+++ lib/libc/gen/_spinlock_stub.c
@@ -31,7 +31,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.8 2003/03/26 04:02:24 jeff Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.8 2003/03/26 04:02:24 jeff Exp $");*/
+__MBSDID("$MidnightBSD$");
#include <stdio.h>
Index: closedir.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/closedir.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/closedir.c -L lib/libc/gen/closedir.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/closedir.c
+++ lib/libc/gen/closedir.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,11 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)closedir.c 8.1 (Berkeley) 6/10/93";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)closedir.c 8.1 (Berkeley) 6/10/93"; */
+
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.10 2002/02/01 00:57:29 obrien Exp $");
+/* __FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.10 2002/02/01 00:57:29 obrien Exp $"); */
+__MBSDID("$MidnightBSD$");
#include "namespace.h"
#include <sys/types.h>
@@ -52,8 +48,7 @@
* close a directory.
*/
int
-closedir(dirp)
- DIR *dirp;
+closedir(DIR *dirp)
{
int fd;
Index: disklabel.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/disklabel.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/disklabel.c -L lib/libc/gen/disklabel.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/disklabel.c
+++ lib/libc/gen/disklabel.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 5/3/95";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 5/3/95"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.16 2002/08/16 15:33:20 bmilekic Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.16 2002/08/16 15:33:20 bmilekic Exp $");*/
+__MBSDID("$MidnightBSD$");
#include <sys/param.h>
#define DKTYPENAMES
Index: dlfcn.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/dlfcn.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/dlfcn.c -L lib/libc/gen/dlfcn.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/dlfcn.c
+++ lib/libc/gen/dlfcn.c
@@ -25,7 +25,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.12 2004/03/05 08:10:17 markm Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.12 2004/03/05 08:10:17 markm Exp $");*/
+__MBSDID("$MidnightBSD$");
/*
* Linkage to services provided by the dynamic linker.
Index: clock.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/clock.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/clock.3 -L lib/libc/gen/clock.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/clock.3
+++ lib/libc/gen/clock.3
@@ -13,10 +13,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -35,6 +31,7 @@
.\"
.\" @(#)clock.3 8.1 (Berkeley) 6/4/93
.\" $FreeBSD: src/lib/libc/gen/clock.3,v 1.11 2001/11/20 13:43:58 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd June 4, 1993
.Dt CLOCK 3
Index: erand48.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/erand48.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/erand48.c -L lib/libc/gen/erand48.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/erand48.c
+++ lib/libc/gen/erand48.c
@@ -12,7 +12,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/erand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/erand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");*/
+__MBSDID("$MidnightBSD$");
#include "rand48.h"
Index: dirname.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/dirname.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/dirname.c -L lib/libc/gen/dirname.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/dirname.c
+++ lib/libc/gen/dirname.c
@@ -25,13 +25,10 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
-#endif /* not lint */
-#endif
+/* static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.7 2002/12/30 01:41:14 marcel Exp $"); */
+__MBSDID("$MidnightBSD$");
#include <errno.h>
#include <libgen.h>
@@ -40,8 +37,7 @@
#include <sys/param.h>
char *
-dirname(path)
- const char *path;
+dirname(const char *path)
{
static char *bname = NULL;
const char *endp;
Index: check_utility_compat.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/check_utility_compat.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/check_utility_compat.3 -L lib/libc/gen/check_utility_compat.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/check_utility_compat.3
+++ lib/libc/gen/check_utility_compat.3
@@ -27,6 +27,7 @@
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD: src/lib/libc/gen/check_utility_compat.3,v 1.3 2005/01/20 09:17:02 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd October 27, 2002
.Os
Index: arc4random.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/arc4random.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/arc4random.c -L lib/libc/gen/arc4random.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/arc4random.c
+++ lib/libc/gen/arc4random.c
@@ -24,7 +24,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $"); */
+__MBSDID("$MidnightBSD$");
#include "namespace.h"
#include <sys/types.h>
@@ -65,11 +66,10 @@
static inline u_int8_t arc4_getbyte(struct arc4_stream *);
static void arc4_stir(struct arc4_stream *);
-static inline void
-arc4_init(as)
- struct arc4_stream *as;
+static inline void
+arc4_init(struct arc4_stream *as)
{
- int n;
+ int n;
for (n = 0; n < 256; n++)
as->s[n] = n;
@@ -77,13 +77,10 @@
as->j = 0;
}
-static inline void
-arc4_addrandom(as, dat, datlen)
- struct arc4_stream *as;
- u_char *dat;
- int datlen;
+static inline void
+arc4_addrandom(struct arc4_stream *as, u_char *dat, int datlen)
{
- int n;
+ int n;
u_int8_t si;
as->i--;
@@ -97,10 +94,9 @@
}
static void
-arc4_stir(as)
- struct arc4_stream *as;
+arc4_stir(struct arc4_stream *as)
{
- int fd, n;
+ int fd, n;
struct {
struct timeval tv;
pid_t pid;
@@ -131,8 +127,7 @@
}
static inline u_int8_t
-arc4_getbyte(as)
- struct arc4_stream *as;
+arc4_getbyte(struct arc4_stream *as)
{
u_int8_t si, sj;
@@ -147,8 +142,7 @@
}
static inline u_int32_t
-arc4_getword(as)
- struct arc4_stream *as;
+arc4_getword(struct arc4_stream *as)
{
u_int32_t val;
@@ -188,9 +182,7 @@
}
void
-arc4random_addrandom(dat, datlen)
- u_char *dat;
- int datlen;
+arc4random_addrandom(u_char *dat, int datlen)
{
THREAD_LOCK();
arc4_check_init();
Index: alarm.3
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/alarm.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/alarm.3 -L lib/libc/gen/alarm.3 -u -r1.1.1.1 -r1.2
--- lib/libc/gen/alarm.3
+++ lib/libc/gen/alarm.3
@@ -9,10 +9,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -31,6 +27,7 @@
.\"
.\" @(#)alarm.3 8.2 (Berkeley) 4/19/94
.\" $FreeBSD: src/lib/libc/gen/alarm.3,v 1.16 2002/12/18 13:33:02 ru Exp $
+.\" $MidnightBSD$
.\"
.Dd April 19, 1994
.Dt ALARM 3
Index: err.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/err.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/err.c -L lib/libc/gen/err.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/err.c
+++ lib/libc/gen/err.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,11 +27,10 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+/* static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93"; */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.13 2002/03/29 22:43:41 markm Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.13 2002/03/29 22:43:41 markm Exp $");*/
+__MBSDID("$MidnightBSD$");
#include "namespace.h"
#include <err.h>
Index: _rand48.c
===================================================================
RCS file: /home/cvs/src/lib/libc/gen/_rand48.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libc/gen/_rand48.c -L lib/libc/gen/_rand48.c -u -r1.1.1.1 -r1.2
--- lib/libc/gen/_rand48.c
+++ lib/libc/gen/_rand48.c
@@ -12,7 +12,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_rand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
+/*__FBSDID("$FreeBSD: src/lib/libc/gen/_rand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");*/
+__MBSDID("$MidnightBSD$");
#include "rand48.h"
More information about the Midnightbsd-cvs
mailing list