Module Name: src
Committed By: dsl
Date: Wed May 18 19:36:36 UTC 2011
Modified Files:
src/lib/libc/stdlib: abort.c exit.c lsearch.c merge.c qsort.c rand48.h
tdelete.c tfind.c tsearch.c twalk.c
Log Message:
Remove __P()
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/stdlib/abort.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/stdlib/exit.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/stdlib/lsearch.c \
src/lib/libc/stdlib/tdelete.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/stdlib/merge.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/stdlib/qsort.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/stdlib/rand48.h \
src/lib/libc/stdlib/tfind.c src/lib/libc/stdlib/tsearch.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/stdlib/twalk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/abort.c
diff -u src/lib/libc/stdlib/abort.c:1.13 src/lib/libc/stdlib/abort.c:1.14
--- src/lib/libc/stdlib/abort.c:1.13 Fri Jan 30 23:21:03 2009
+++ src/lib/libc/stdlib/abort.c Wed May 18 19:36:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: abort.c,v 1.13 2009/01/30 23:21:03 ad Exp $ */
+/* $NetBSD: abort.c,v 1.14 2011/05/18 19:36:36 dsl Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)abort.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: abort.c,v 1.13 2009/01/30 23:21:03 ad Exp $");
+__RCSID("$NetBSD: abort.c,v 1.14 2011/05/18 19:36:36 dsl Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -43,7 +43,7 @@
#include <stdlib.h>
#include <unistd.h>
-extern void (*__cleanup) __P((void));
+extern void (*__cleanup)(void);
static int aborting = 0;
void
Index: src/lib/libc/stdlib/exit.c
diff -u src/lib/libc/stdlib/exit.c:1.14 src/lib/libc/stdlib/exit.c:1.15
--- src/lib/libc/stdlib/exit.c:1.14 Mon Mar 7 05:09:12 2011
+++ src/lib/libc/stdlib/exit.c Wed May 18 19:36:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: exit.c,v 1.14 2011/03/07 05:09:12 joerg Exp $ */
+/* $NetBSD: exit.c,v 1.15 2011/05/18 19:36:36 dsl Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exit.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: exit.c,v 1.14 2011/03/07 05:09:12 joerg Exp $");
+__RCSID("$NetBSD: exit.c,v 1.15 2011/05/18 19:36:36 dsl Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -45,7 +45,7 @@
#include "atexit.h"
#endif
-void (*__cleanup) __P((void));
+void (*__cleanup)(void);
/*
* Exit, flushing stdio buffers if necessary.
Index: src/lib/libc/stdlib/lsearch.c
diff -u src/lib/libc/stdlib/lsearch.c:1.4 src/lib/libc/stdlib/lsearch.c:1.5
--- src/lib/libc/stdlib/lsearch.c:1.4 Sat Jul 16 17:32:09 2005
+++ src/lib/libc/stdlib/lsearch.c Wed May 18 19:36:36 2011
@@ -35,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: lsearch.c,v 1.4 2005/07/16 17:32:09 christos Exp $");
+__RCSID("$NetBSD: lsearch.c,v 1.5 2011/05/18 19:36:36 dsl Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -46,9 +46,9 @@
#include <string.h>
#include <search.h>
-typedef int (*cmp_fn_t) __P((const void *, const void *));
-static void *linear_base __P((const void *, void *, size_t *, size_t,
- cmp_fn_t, int));
+typedef int (*cmp_fn_t)(const void *, const void *);
+static void *linear_base(const void *, void *, size_t *, size_t,
+ cmp_fn_t, int);
void *
lsearch(key, base, nelp, width, compar)
Index: src/lib/libc/stdlib/tdelete.c
diff -u src/lib/libc/stdlib/tdelete.c:1.4 src/lib/libc/stdlib/tdelete.c:1.5
--- src/lib/libc/stdlib/tdelete.c:1.4 Sun Mar 19 01:12:08 2006
+++ src/lib/libc/stdlib/tdelete.c Wed May 18 19:36:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tdelete.c,v 1.4 2006/03/19 01:12:08 christos Exp $ */
+/* $NetBSD: tdelete.c,v 1.5 2011/05/18 19:36:36 dsl Exp $ */
/*
* Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -13,7 +13,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tdelete.c,v 1.4 2006/03/19 01:12:08 christos Exp $");
+__RCSID("$NetBSD: tdelete.c,v 1.5 2011/05/18 19:36:36 dsl Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -27,7 +27,7 @@
tdelete(vkey, vrootp, compar)
const void *vkey; /* key to be deleted */
void **vrootp; /* address of the root of tree */
- int (*compar) __P((const void *, const void *));
+ int (*compar)(const void *, const void *);
{
node_t **rootp = (node_t **)vrootp;
node_t *p, *q, *r;
Index: src/lib/libc/stdlib/merge.c
diff -u src/lib/libc/stdlib/merge.c:1.12 src/lib/libc/stdlib/merge.c:1.13
--- src/lib/libc/stdlib/merge.c:1.12 Thu Feb 12 03:12:36 2009
+++ src/lib/libc/stdlib/merge.c Wed May 18 19:36:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: merge.c,v 1.12 2009/02/12 03:12:36 lukem Exp $ */
+/* $NetBSD: merge.c,v 1.13 2011/05/18 19:36:36 dsl Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)merge.c 8.2 (Berkeley) 2/14/94";
#else
-__RCSID("$NetBSD: merge.c,v 1.12 2009/02/12 03:12:36 lukem Exp $");
+__RCSID("$NetBSD: merge.c,v 1.13 2011/05/18 19:36:36 dsl Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -67,10 +67,10 @@
__weak_alias(mergesort,_mergesort)
#endif
-static void setup __P((u_char *, u_char *, size_t, size_t,
- int (*)(const void *, const void *)));
-static void insertionsort __P((u_char *, size_t, size_t,
- int (*)(const void *, const void *)));
+static void setup(u_char *, u_char *, size_t, size_t,
+ int (*)(const void *, const void *));
+static void insertionsort(u_char *, size_t, size_t,
+ int (*)(const void *, const void *));
#define ISIZE sizeof(int)
#define PSIZE sizeof(u_char *)
@@ -112,7 +112,7 @@
void *base;
size_t nmemb;
size_t size;
- int (*cmp) __P((const void *, const void *));
+ int (*cmp)(const void *, const void *);
{
size_t i;
int sense;
@@ -283,7 +283,7 @@
void
setup(list1, list2, n, size, cmp)
size_t n, size;
- int (*cmp) __P((const void *, const void *));
+ int (*cmp)(const void *, const void *);
u_char *list1, *list2;
{
int i, length, size2, tmp, sense;
@@ -362,7 +362,7 @@
insertionsort(a, n, size, cmp)
u_char *a;
size_t n, size;
- int (*cmp) __P((const void *, const void *));
+ int (*cmp)(const void *, const void *);
{
u_char *ai, *s, *t, *u, tmp;
int i;
Index: src/lib/libc/stdlib/qsort.c
diff -u src/lib/libc/stdlib/qsort.c:1.20 src/lib/libc/stdlib/qsort.c:1.21
--- src/lib/libc/stdlib/qsort.c:1.20 Mon Jun 1 06:37:40 2009
+++ src/lib/libc/stdlib/qsort.c Wed May 18 19:36:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: qsort.c,v 1.20 2009/06/01 06:37:40 yamt Exp $ */
+/* $NetBSD: qsort.c,v 1.21 2011/05/18 19:36:36 dsl Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)qsort.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: qsort.c,v 1.20 2009/06/01 06:37:40 yamt Exp $");
+__RCSID("$NetBSD: qsort.c,v 1.21 2011/05/18 19:36:36 dsl Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -44,9 +44,9 @@
#include <errno.h>
#include <stdlib.h>
-static inline char *med3 __P((char *, char *, char *,
- int (*)(const void *, const void *)));
-static inline void swapfunc __P((char *, char *, size_t, int));
+static inline char *med3(char *, char *, char *,
+ int (*)(const void *, const void *));
+static inline void swapfunc(char *, char *, size_t, int);
#define min(a, b) (a) < (b) ? a : b
@@ -89,7 +89,7 @@
static inline char *
med3(char *a, char *b, char *c,
- int (*cmp) __P((const void *, const void *)))
+ int (*cmp)(const void *, const void *))
{
return cmp(a, b) < 0 ?
@@ -99,7 +99,7 @@
void
qsort(void *a, size_t n, size_t es,
- int (*cmp) __P((const void *, const void *)))
+ int (*cmp)(const void *, const void *))
{
char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
size_t d, r;
Index: src/lib/libc/stdlib/rand48.h
diff -u src/lib/libc/stdlib/rand48.h:1.5 src/lib/libc/stdlib/rand48.h:1.6
--- src/lib/libc/stdlib/rand48.h:1.5 Wed Mar 22 20:52:16 2006
+++ src/lib/libc/stdlib/rand48.h Wed May 18 19:36:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rand48.h,v 1.5 2006/03/22 20:52:16 drochner Exp $ */
+/* $NetBSD: rand48.h,v 1.6 2011/05/18 19:36:36 dsl Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -18,7 +18,7 @@
#include <stdlib.h>
-extern void __dorand48 __P((unsigned short[3]));
+extern void __dorand48(unsigned short[3]);
extern unsigned short __rand48_seed[3];
extern unsigned short __rand48_mult[3];
extern unsigned short __rand48_add;
Index: src/lib/libc/stdlib/tfind.c
diff -u src/lib/libc/stdlib/tfind.c:1.5 src/lib/libc/stdlib/tfind.c:1.6
--- src/lib/libc/stdlib/tfind.c:1.5 Wed Mar 23 08:16:53 2005
+++ src/lib/libc/stdlib/tfind.c Wed May 18 19:36:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tfind.c,v 1.5 2005/03/23 08:16:53 kleink Exp $ */
+/* $NetBSD: tfind.c,v 1.6 2011/05/18 19:36:36 dsl Exp $ */
/*
* Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -13,7 +13,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tfind.c,v 1.5 2005/03/23 08:16:53 kleink Exp $");
+__RCSID("$NetBSD: tfind.c,v 1.6 2011/05/18 19:36:36 dsl Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -26,7 +26,7 @@
tfind(vkey, vrootp, compar)
const void *vkey; /* key to be found */
void * const *vrootp; /* address of the tree root */
- int (*compar) __P((const void *, const void *));
+ int (*compar)(const void *, const void *);
{
node_t * const *rootp = (node_t * const*)vrootp;
Index: src/lib/libc/stdlib/tsearch.c
diff -u src/lib/libc/stdlib/tsearch.c:1.5 src/lib/libc/stdlib/tsearch.c:1.6
--- src/lib/libc/stdlib/tsearch.c:1.5 Tue Nov 29 03:12:00 2005
+++ src/lib/libc/stdlib/tsearch.c Wed May 18 19:36:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tsearch.c,v 1.5 2005/11/29 03:12:00 christos Exp $ */
+/* $NetBSD: tsearch.c,v 1.6 2011/05/18 19:36:36 dsl Exp $ */
/*
* Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -13,7 +13,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tsearch.c,v 1.5 2005/11/29 03:12:00 christos Exp $");
+__RCSID("$NetBSD: tsearch.c,v 1.6 2011/05/18 19:36:36 dsl Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -26,7 +26,7 @@
tsearch(vkey, vrootp, compar)
const void *vkey; /* key to be located */
void **vrootp; /* address of tree root */
- int (*compar) __P((const void *, const void *));
+ int (*compar)(const void *, const void *);
{
node_t *q;
node_t **rootp = (node_t **)vrootp;
Index: src/lib/libc/stdlib/twalk.c
diff -u src/lib/libc/stdlib/twalk.c:1.2 src/lib/libc/stdlib/twalk.c:1.3
--- src/lib/libc/stdlib/twalk.c:1.2 Thu Sep 16 11:45:37 1999
+++ src/lib/libc/stdlib/twalk.c Wed May 18 19:36:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: twalk.c,v 1.2 1999/09/16 11:45:37 lukem Exp $ */
+/* $NetBSD: twalk.c,v 1.3 2011/05/18 19:36:36 dsl Exp $ */
/*
* Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -13,7 +13,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: twalk.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
+__RCSID("$NetBSD: twalk.c,v 1.3 2011/05/18 19:36:36 dsl Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -21,14 +21,14 @@
#include <search.h>
#include <stdlib.h>
-static void trecurse __P((const node_t *,
- void (*action)(const void *, VISIT, int), int level));
+static void trecurse(const node_t *,
+ void (*action)(const void *, VISIT, int), int level);
/* Walk the nodes of a tree */
static void
trecurse(root, action, level)
const node_t *root; /* Root of the tree to be walked */
- void (*action) __P((const void *, VISIT, int));
+ void (*action)(const void *, VISIT, int);
int level;
{
_DIAGASSERT(root != NULL);
@@ -51,7 +51,7 @@
void
twalk(vroot, action)
const void *vroot; /* Root of the tree to be walked */
- void (*action) __P((const void *, VISIT, int));
+ void (*action)(const void *, VISIT, int);
{
if (vroot != NULL && action != NULL)
trecurse(vroot, action, 0);
