svn commit: r189328 - head/lib/libc/gen
Xin LI
delphij at FreeBSD.org
Tue Mar 3 17:01:28 PST 2009
Author: delphij
Date: Wed Mar 4 01:01:26 2009
New Revision: 189328
URL: http://svn.freebsd.org/changeset/base/189328
Log:
Sync license changes.
Obtained from: NetBSD
Modified:
head/lib/libc/gen/lockf.3
head/lib/libc/gen/lockf.c
Modified: head/lib/libc/gen/lockf.3
==============================================================================
--- head/lib/libc/gen/lockf.3 Wed Mar 4 00:58:04 2009 (r189327)
+++ head/lib/libc/gen/lockf.3 Wed Mar 4 01:01:26 2009 (r189328)
@@ -1,4 +1,4 @@
-.\" $NetBSD: lockf.3,v 1.2 1998/02/05 18:47:28 perry Exp $
+.\" $NetBSD: lockf.3,v 1.10 2008/04/30 13:10:50 martin Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -14,13 +14,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 NetBSD
-.\" Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\" contributors may be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Modified: head/lib/libc/gen/lockf.c
==============================================================================
--- head/lib/libc/gen/lockf.c Wed Mar 4 00:58:04 2009 (r189327)
+++ head/lib/libc/gen/lockf.c Wed Mar 4 01:01:26 2009 (r189328)
@@ -1,3 +1,4 @@
+/* $NetBSD: lockf.c,v 1.3 2008/04/28 20:22:59 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -13,13 +14,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 NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -34,7 +28,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/* $NetBSD: lockf.c,v 1.1 1997/12/20 20:23:18 kleink Exp $ */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -45,10 +38,7 @@ __FBSDID("$FreeBSD$");
#include "un-namespace.h"
int
-lockf(filedes, function, size)
- int filedes;
- int function;
- off_t size;
+lockf(int filedes, int function, off_t size)
{
struct flock fl;
int cmd;
More information about the svn-src-all
mailing list