Libc-763.11.tar.gz

[apple/libc.git] / db / btree / FreeBSD / bt_conv.c

diff --git a/db/btree/FreeBSD/bt_conv.c b/db/btree/FreeBSD/bt_conv.c
index 7496a3c3760455c1dfe5b33a4f73c98d501def05..3774ed4dbf1e314aaa240110ebcb7accade508a1 100644 (file)
--- a/db/btree/FreeBSD/bt_conv.c
+++ b/db/btree/FreeBSD/bt_conv.c
@@ -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.
@@ -38,7 +34,7 @@
 static char sccsid[] = "@(#)bt_conv.c  8.5 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_conv.c,v 1.2 2002/03/21 22:46:25 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_conv.c,v 1.4 2009/03/02 23:47:18 delphij Exp $");
 
 #include <sys/param.h>
 
@@ -60,10 +56,7 @@ static void mswap(PAGE *);
  *     h:      page to convert
  */
 void
-__bt_pgin(t, pg, pp)
-       void *t;
-       pgno_t pg;
-       void *pp;
+__bt_pgin(void *t, pgno_t pg, void *pp)
 {
        PAGE *h;
        indx_t i, top;
@@ -128,10 +121,7 @@ __bt_pgin(t, pg, pp)
 }
 
 void
-__bt_pgout(t, pg, pp)
-       void *t;
-       pgno_t pg;
-       void *pp;
+__bt_pgout(void *t, pgno_t pg, void *pp)
 {
        PAGE *h;
        indx_t i, top;
@@ -202,8 +192,7 @@ __bt_pgout(t, pg, pp)
  *     p:      page to convert
  */
 static void
-mswap(pg)
-       PAGE *pg;
+mswap(PAGE *pg)
 {
        char *p;