summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorpooka <pooka@NetBSD.org>2007-06-06 01:54:59 +0000
committerpooka <pooka@NetBSD.org>2007-06-06 01:54:59 +0000
commitf8326bf98ef8db583b1b30943f8cedd47fa4a2f0 (patch)
treecdfc2089e55ba9a91a5631eb425bf1dba00d45d0 /lib
parente2819ad1be608ac534a3ef6f36abd616fe31ff1c (diff)
Move puffs to a two clause license where it already isn't so. And
as agc pointed out, even files with the third clause were already effectively two clause because of a slight bug in the language...
Diffstat (limited to 'lib')
-rw-r--r--lib/libpuffs/callcontext.c7
-rw-r--r--lib/libpuffs/creds.c7
-rw-r--r--lib/libpuffs/dispatcher.c7
-rw-r--r--lib/libpuffs/flush.c7
-rw-r--r--lib/libpuffs/null.c7
-rw-r--r--lib/libpuffs/opdump.c7
-rw-r--r--lib/libpuffs/paths.c7
-rw-r--r--lib/libpuffs/pnode.c7
-rw-r--r--lib/libpuffs/puffs.c7
-rw-r--r--lib/libpuffs/puffs.h5
-rw-r--r--lib/libpuffs/puffs_priv.h5
-rw-r--r--lib/libpuffs/puffsdump.h5
-rw-r--r--lib/libpuffs/requests.c7
-rw-r--r--lib/libpuffs/subr.c7
-rw-r--r--lib/libpuffs/suspend.c7
15 files changed, 27 insertions, 72 deletions
diff --git a/lib/libpuffs/callcontext.c b/lib/libpuffs/callcontext.c
index 934a7c663b6..9409d48a9a1 100644
--- a/lib/libpuffs/callcontext.c
+++ b/lib/libpuffs/callcontext.c
@@ -1,4 +1,4 @@
-/* $NetBSD: callcontext.c,v 1.6 2007/05/15 13:44:46 pooka Exp $ */
+/* $NetBSD: callcontext.c,v 1.7 2007/06/06 01:55:00 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: callcontext.c,v 1.6 2007/05/15 13:44:46 pooka Exp $");
+__RCSID("$NetBSD: callcontext.c,v 1.7 2007/06/06 01:55:00 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
diff --git a/lib/libpuffs/creds.c b/lib/libpuffs/creds.c
index dff9ffa27ce..16a0d75c7b4 100644
--- a/lib/libpuffs/creds.c
+++ b/lib/libpuffs/creds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: creds.c,v 1.9 2007/03/22 17:15:34 pooka Exp $ */
+/* $NetBSD: creds.c,v 1.10 2007/06/06 01:55:00 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -13,9 +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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -32,7 +29,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: creds.c,v 1.9 2007/03/22 17:15:34 pooka Exp $");
+__RCSID("$NetBSD: creds.c,v 1.10 2007/06/06 01:55:00 pooka Exp $");
#endif /* !lint */
/*
diff --git a/lib/libpuffs/dispatcher.c b/lib/libpuffs/dispatcher.c
index 5fed3d21d28..6c2f34b8af3 100644
--- a/lib/libpuffs/dispatcher.c
+++ b/lib/libpuffs/dispatcher.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatcher.c,v 1.5 2007/05/18 18:01:55 pooka Exp $ */
+/* $NetBSD: dispatcher.c,v 1.6 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -14,9 +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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -33,7 +30,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: dispatcher.c,v 1.5 2007/05/18 18:01:55 pooka Exp $");
+__RCSID("$NetBSD: dispatcher.c,v 1.6 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
diff --git a/lib/libpuffs/flush.c b/lib/libpuffs/flush.c
index d229324cf9f..e56ed11d77d 100644
--- a/lib/libpuffs/flush.c
+++ b/lib/libpuffs/flush.c
@@ -1,4 +1,4 @@
-/* $NetBSD: flush.c,v 1.9 2007/04/13 13:35:46 pooka Exp $ */
+/* $NetBSD: flush.c,v 1.10 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: flush.c,v 1.9 2007/04/13 13:35:46 pooka Exp $");
+__RCSID("$NetBSD: flush.c,v 1.10 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
/*
diff --git a/lib/libpuffs/null.c b/lib/libpuffs/null.c
index d434d15b0a0..ce5b6275e49 100644
--- a/lib/libpuffs/null.c
+++ b/lib/libpuffs/null.c
@@ -1,4 +1,4 @@
-/* $NetBSD: null.c,v 1.13 2007/04/12 15:09:01 pooka Exp $ */
+/* $NetBSD: null.c,v 1.14 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: null.c,v 1.13 2007/04/12 15:09:01 pooka Exp $");
+__RCSID("$NetBSD: null.c,v 1.14 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
/*
diff --git a/lib/libpuffs/opdump.c b/lib/libpuffs/opdump.c
index f94088c34e0..d86b0749f07 100644
--- a/lib/libpuffs/opdump.c
+++ b/lib/libpuffs/opdump.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opdump.c,v 1.9 2007/03/20 10:22:22 pooka Exp $ */
+/* $NetBSD: opdump.c,v 1.10 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -36,7 +33,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: opdump.c,v 1.9 2007/03/20 10:22:22 pooka Exp $");
+__RCSID("$NetBSD: opdump.c,v 1.10 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
#include <puffs.h>
diff --git a/lib/libpuffs/paths.c b/lib/libpuffs/paths.c
index ea37143f714..50c12fb0a8c 100644
--- a/lib/libpuffs/paths.c
+++ b/lib/libpuffs/paths.c
@@ -1,4 +1,4 @@
-/* $NetBSD: paths.c,v 1.6 2007/05/01 15:58:00 pooka Exp $ */
+/* $NetBSD: paths.c,v 1.7 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: paths.c,v 1.6 2007/05/01 15:58:00 pooka Exp $");
+__RCSID("$NetBSD: paths.c,v 1.7 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
#include <sys/hash.h>
diff --git a/lib/libpuffs/pnode.c b/lib/libpuffs/pnode.c
index b83fad53456..ff2f337e49a 100644
--- a/lib/libpuffs/pnode.c
+++ b/lib/libpuffs/pnode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pnode.c,v 1.5 2007/04/12 15:09:01 pooka Exp $ */
+/* $NetBSD: pnode.c,v 1.6 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: pnode.c,v 1.5 2007/04/12 15:09:01 pooka Exp $");
+__RCSID("$NetBSD: pnode.c,v 1.6 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
diff --git a/lib/libpuffs/puffs.c b/lib/libpuffs/puffs.c
index 03aeb9e70f9..e487505e941 100644
--- a/lib/libpuffs/puffs.c
+++ b/lib/libpuffs/puffs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.c,v 1.51 2007/05/21 08:30:49 pooka Exp $ */
+/* $NetBSD: puffs.c,v 1.52 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -34,7 +31,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: puffs.c,v 1.51 2007/05/21 08:30:49 pooka Exp $");
+__RCSID("$NetBSD: puffs.c,v 1.52 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
#include <sys/param.h>
diff --git a/lib/libpuffs/puffs.h b/lib/libpuffs/puffs.h
index 708d4a96657..d9070bcd3cb 100644
--- a/lib/libpuffs/puffs.h
+++ b/lib/libpuffs/puffs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.h,v 1.61 2007/05/20 19:56:56 pooka Exp $ */
+/* $NetBSD: puffs.h,v 1.62 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -15,9 +15,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/lib/libpuffs/puffs_priv.h b/lib/libpuffs/puffs_priv.h
index faeb6f8da0a..cef672d328b 100644
--- a/lib/libpuffs/puffs_priv.h
+++ b/lib/libpuffs/puffs_priv.h
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_priv.h,v 1.11 2007/05/20 16:24:37 pooka Exp $ */
+/* $NetBSD: puffs_priv.h,v 1.12 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/lib/libpuffs/puffsdump.h b/lib/libpuffs/puffsdump.h
index 4474a96e425..f01e7636339 100644
--- a/lib/libpuffs/puffsdump.h
+++ b/lib/libpuffs/puffsdump.h
@@ -1,4 +1,4 @@
-/* $NetBSD: puffsdump.h,v 1.2 2007/02/18 17:36:48 pooka Exp $ */
+/* $NetBSD: puffsdump.h,v 1.3 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -13,9 +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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/lib/libpuffs/requests.c b/lib/libpuffs/requests.c
index e5af05efbbf..c93536810a7 100644
--- a/lib/libpuffs/requests.c
+++ b/lib/libpuffs/requests.c
@@ -1,4 +1,4 @@
-/* $NetBSD: requests.c,v 1.7 2007/05/11 21:27:13 pooka Exp $ */
+/* $NetBSD: requests.c,v 1.8 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: requests.c,v 1.7 2007/05/11 21:27:13 pooka Exp $");
+__RCSID("$NetBSD: requests.c,v 1.8 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
diff --git a/lib/libpuffs/subr.c b/lib/libpuffs/subr.c
index b3d2210ad66..7efb32dc785 100644
--- a/lib/libpuffs/subr.c
+++ b/lib/libpuffs/subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr.c,v 1.16 2007/03/20 18:28:08 pooka Exp $ */
+/* $NetBSD: subr.c,v 1.17 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: subr.c,v 1.16 2007/03/20 18:28:08 pooka Exp $");
+__RCSID("$NetBSD: subr.c,v 1.17 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
diff --git a/lib/libpuffs/suspend.c b/lib/libpuffs/suspend.c
index e6a4af555d6..9c7cb9c5db4 100644
--- a/lib/libpuffs/suspend.c
+++ b/lib/libpuffs/suspend.c
@@ -1,4 +1,4 @@
-/* $NetBSD: suspend.c,v 1.3 2007/04/13 13:35:46 pooka Exp $ */
+/* $NetBSD: suspend.c,v 1.4 2007/06/06 01:55:01 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -11,9 +11,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. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: suspend.c,v 1.3 2007/04/13 13:35:46 pooka Exp $");
+__RCSID("$NetBSD: suspend.c,v 1.4 2007/06/06 01:55:01 pooka Exp $");
#endif /* !lint */
/*