ansification: remove _AND

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

9 files changed, 35 insertions, 35 deletions

diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index 579633c12..c15ea64d2 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -57,10 +57,10 @@ No supporting OS subroutines are required.
 
 _PTR
 _DEFUN (bsearch, (key, base, nmemb, size, compar),
-	_CONST _PTR key _AND
-	_CONST _PTR base _AND
-	size_t nmemb _AND
-	size_t size _AND
+	_CONST _PTR key,
+	_CONST _PTR base,
+	size_t nmemb,
+	size_t size,
 	int _EXFNPTR(compar, (const _PTR, const _PTR)))
 {
   _PTR current;
diff --git a/newlib/libc/search/hash.c b/newlib/libc/search/hash.c
index 5fea88a82..f20322c42 100644
--- a/newlib/libc/search/hash.c
+++ b/newlib/libc/search/hash.c
@@ -105,10 +105,10 @@ int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
 
 extern DB *
 _DEFUN(__hash_open, (file, flags, mode, info, dflags),
-	const char *file _AND
-	int flags _AND
-	int mode _AND
-	int dflags _AND
+	const char *file,
+	int flags,
+	int mode,
+	int dflags,
 	const HASHINFO *info)	/* Special directives for create */
 {
 	HTAB *hashp;
diff --git a/newlib/libc/search/hcreate.c b/newlib/libc/search/hcreate.c
index b7be1cd6f..800211689 100644
--- a/newlib/libc/search/hcreate.c
+++ b/newlib/libc/search/hcreate.c
@@ -70,7 +70,7 @@ _DEFUN_VOID (hdestroy)
 
 ENTRY *
 _DEFUN(hsearch, (item, action), 
-       ENTRY item _AND
+       ENTRY item,
        ACTION action)
 {
   ENTRY *retval;
diff --git a/newlib/libc/search/qsort.c b/newlib/libc/search/qsort.c
index 9a8e7fabe..e24a62a55 100644
--- a/newlib/libc/search/qsort.c
+++ b/newlib/libc/search/qsort.c
@@ -101,9 +101,9 @@ static inline void	 swapfunc _PARAMS((char *, char *, int, int));
 
 static inline void
 _DEFUN(swapfunc, (a, b, n, swaptype),
-	char *a _AND
-	char *b _AND
-	int n _AND
+	char *a,
+	char *b,
+	int n,
 	int swaptype)
 {
 	if(swaptype <= 1)
@@ -132,10 +132,10 @@ _DEFUN(swapfunc, (a, b, n, swaptype),
 
 static inline char *
 _DEFUN(med3, (a, b, c, cmp, thunk),
-	char *a _AND
-	char *b _AND
-	char *c _AND
-	cmp_t *cmp _AND
+	char *a,
+	char *b,
+	char *c,
+	cmp_t *cmp,
 	void *thunk
 #if !defined(I_AM_QSORT_R) && !defined(I_AM_GNU_QSORT_R)
 __unused
@@ -150,26 +150,26 @@ __unused
 #if defined(I_AM_QSORT_R)
 void
 _DEFUN(__bsd_qsort_r, (a, n, es, thunk, cmp),
-	void *a _AND
-	size_t n _AND
-	size_t es _AND
-	void *thunk _AND
+	void *a,
+	size_t n,
+	size_t es,
+	void *thunk,
 	cmp_t *cmp)
 #elif defined(I_AM_GNU_QSORT_R)
 void
 _DEFUN(qsort_r, (a, n, es, cmp, thunk),
-	void *a _AND
-	size_t n _AND
-	size_t es _AND
-	cmp_t *cmp _AND
+	void *a,
+	size_t n,
+	size_t es,
+	cmp_t *cmp,
 	void *thunk)
 #else
 #define thunk NULL
 void
 _DEFUN(qsort, (a, n, es, cmp),
-	void *a _AND
-	size_t n _AND
-	size_t es _AND
+	void *a,
+	size_t n,
+	size_t es,
 	cmp_t *cmp)
 #endif
 {
diff --git a/newlib/libc/search/tdelete.c b/newlib/libc/search/tdelete.c
index b607b5421..a0128e98b 100644
--- a/newlib/libc/search/tdelete.c
+++ b/newlib/libc/search/tdelete.c
@@ -27,8 +27,8 @@ __RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 /* delete node with given key */
 void *
 _DEFUN(tdelete, (vkey, vrootp, compar),
-	const void *__restrict vkey _AND	/* key to be deleted */
-	void      **__restrict vrootp _AND	/* address of the root of tree */
+	const void *__restrict vkey,	/* key to be deleted */
+	void      **__restrict vrootp,	/* address of the root of tree */
 	int       (*compar)(const void *, const void *))
 {
 	node_t **rootp = (node_t **)vrootp;
diff --git a/newlib/libc/search/tdestroy.c b/newlib/libc/search/tdestroy.c
index 3e7327c4d..e1418207a 100644
--- a/newlib/libc/search/tdestroy.c
+++ b/newlib/libc/search/tdestroy.c
@@ -41,7 +41,7 @@ trecurse(root, free_action)
 
 void
 _DEFUN(tdestroy, (vrootp, freefct),
-       void *vrootp _AND
+       void *vrootp,
        void (*freefct)(void *))
 {
   node_t *root = (node_t *) vrootp;
diff --git a/newlib/libc/search/tfind.c b/newlib/libc/search/tfind.c
index 5d7c40c93..108213048 100644
--- a/newlib/libc/search/tfind.c
+++ b/newlib/libc/search/tfind.c
@@ -26,8 +26,8 @@ __RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 /* find a node, or return 0 */
 void *
 _DEFUN(tfind, (vkey, vrootp, compar),
-	const void *vkey _AND		/* key to be found */
-	void **vrootp _AND		/* address of the tree root */
+	const void *vkey,		/* key to be found */
+	void **vrootp,		/* address of the tree root */
 	int (*compar)(const void *, const void *))
 {
 	node_t **rootp = (node_t **)vrootp;
diff --git a/newlib/libc/search/tsearch.c b/newlib/libc/search/tsearch.c
index 5f41b407d..8fe265703 100644
--- a/newlib/libc/search/tsearch.c
+++ b/newlib/libc/search/tsearch.c
@@ -26,8 +26,8 @@ __RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
 /* find or insert datum into search tree */
 void *
 _DEFUN(tsearch, (vkey, vrootp, compar),
-	const void *vkey _AND		/* key to be located */
-	void **vrootp _AND		/* address of tree root */
+	const void *vkey,		/* key to be located */
+	void **vrootp,		/* address of tree root */
 	int (*compar)(const void *, const void *))
 {
 	node_t *q;
diff --git a/newlib/libc/search/twalk.c b/newlib/libc/search/twalk.c
index 74ad5a615..26d6e97db 100644
--- a/newlib/libc/search/twalk.c
+++ b/newlib/libc/search/twalk.c
@@ -50,7 +50,7 @@ trecurse(root, action, level)
 /* Walk the nodes of a tree */
 void
 _DEFUN(twalk, (vroot, action),
-	const void *vroot _AND	/* Root of the tree to be walked */
+	const void *vroot,	/* Root of the tree to be walked */
 	void (*action)(const void *, VISIT, int))
 {
 	if (vroot != NULL && action != NULL)