ansification: remove _AND

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

18 files changed, 43 insertions, 43 deletions

diff --git a/newlib/libc/argz/argz_add.c b/newlib/libc/argz/argz_add.c
index 1c3b17025..3194f0851 100644
--- a/newlib/libc/argz/argz_add.c
+++ b/newlib/libc/argz/argz_add.c
@@ -12,8 +12,8 @@
 
 error_t
 _DEFUN (argz_add, (argz, argz_len, str),
-       char **argz _AND
-       size_t *argz_len _AND
+       char **argz,
+       size_t *argz_len,
        const char *str)
 {
   int len_to_add = 0;
diff --git a/newlib/libc/argz/argz_add_sep.c b/newlib/libc/argz/argz_add_sep.c
index 7dfbb4d6e..92c73716d 100644
--- a/newlib/libc/argz/argz_add_sep.c
+++ b/newlib/libc/argz/argz_add_sep.c
@@ -12,9 +12,9 @@
 
 error_t
 _DEFUN (argz_add_sep, (argz, argz_len, str, sep),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *str _AND
+       char **argz,
+       size_t *argz_len,
+       const char *str,
        int sep)
 {
   char *str_argz = 0;
diff --git a/newlib/libc/argz/argz_append.c b/newlib/libc/argz/argz_append.c
index c6c3dbee9..a84f8e0b9 100644
--- a/newlib/libc/argz/argz_append.c
+++ b/newlib/libc/argz/argz_append.c
@@ -12,9 +12,9 @@
 
 error_t
 _DEFUN (argz_append, (argz, argz_len, buf, buf_len),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *buf _AND
+       char **argz,
+       size_t *argz_len,
+       const char *buf,
        size_t buf_len)
 {
   if (buf_len)
diff --git a/newlib/libc/argz/argz_count.c b/newlib/libc/argz/argz_count.c
index 4761275df..33d0eecc2 100644
--- a/newlib/libc/argz/argz_count.c
+++ b/newlib/libc/argz/argz_count.c
@@ -11,7 +11,7 @@
 
 size_t
 _DEFUN (argz_count, (argz, argz_len), 
-       const char *argz _AND
+       const char *argz,
        size_t argz_len)
 {
   int i;
diff --git a/newlib/libc/argz/argz_create.c b/newlib/libc/argz/argz_create.c
index 9d7b2f13d..d4b8b0592 100644
--- a/newlib/libc/argz/argz_create.c
+++ b/newlib/libc/argz/argz_create.c
@@ -12,8 +12,8 @@
 
 error_t
 _DEFUN (argz_create, (argv, argz, argz_len),
-       char *const argv[] _AND
-       char **argz _AND
+       char *const argv[],
+       char **argz,
        size_t *argz_len)
 {
   int argc = 0;
diff --git a/newlib/libc/argz/argz_create_sep.c b/newlib/libc/argz/argz_create_sep.c
index 38866e1d5..afff44c1e 100644
--- a/newlib/libc/argz/argz_create_sep.c
+++ b/newlib/libc/argz/argz_create_sep.c
@@ -12,9 +12,9 @@
 
 error_t
 _DEFUN (argz_create_sep, (string, sep, argz, argz_len),
-       const char *string _AND
-       int sep _AND
-       char **argz _AND
+       const char *string,
+       int sep,
+       char **argz,
        size_t *argz_len)
 {
   int len = 0;
diff --git a/newlib/libc/argz/argz_delete.c b/newlib/libc/argz/argz_delete.c
index aa94f6d7a..a4e12273d 100644
--- a/newlib/libc/argz/argz_delete.c
+++ b/newlib/libc/argz/argz_delete.c
@@ -12,8 +12,8 @@
 
 error_t
 _DEFUN (argz_delete, (argz, argz_len, entry),
-       char **argz _AND
-       size_t *argz_len _AND
+       char **argz,
+       size_t *argz_len,
        char *entry)
 {
   int len = 0;
diff --git a/newlib/libc/argz/argz_extract.c b/newlib/libc/argz/argz_extract.c
index a819f3953..4932de6a9 100644
--- a/newlib/libc/argz/argz_extract.c
+++ b/newlib/libc/argz/argz_extract.c
@@ -10,8 +10,8 @@
 
 void
 _DEFUN (argz_extract, (argz, argz_len, argv),
-       char *argz _AND
-       size_t argz_len _AND
+       char *argz,
+       size_t argz_len,
        char **argv)
 {
   size_t i = 0;
diff --git a/newlib/libc/argz/argz_insert.c b/newlib/libc/argz/argz_insert.c
index d0a32eca9..5965e04a6 100644
--- a/newlib/libc/argz/argz_insert.c
+++ b/newlib/libc/argz/argz_insert.c
@@ -14,9 +14,9 @@
 
 error_t
 _DEFUN (argz_insert, (argz, argz_len, before, entry),
-       char **argz _AND
-       size_t *argz_len _AND
-       char *before _AND
+       char **argz,
+       size_t *argz_len,
+       char *before,
        const char *entry)
 {
   int len = 0;
diff --git a/newlib/libc/argz/argz_next.c b/newlib/libc/argz/argz_next.c
index 94852f538..3f672217e 100644
--- a/newlib/libc/argz/argz_next.c
+++ b/newlib/libc/argz/argz_next.c
@@ -12,8 +12,8 @@
 
 char *
 _DEFUN (argz_next, (argz, argz_len, entry),
-       char *argz _AND
-       size_t argz_len _AND
+       char *argz,
+       size_t argz_len,
        const char *entry)
 {
   if (entry)
diff --git a/newlib/libc/argz/argz_replace.c b/newlib/libc/argz/argz_replace.c
index b274f91b6..e6c6ead3e 100644
--- a/newlib/libc/argz/argz_replace.c
+++ b/newlib/libc/argz/argz_replace.c
@@ -14,10 +14,10 @@
 
 error_t
 _DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *str _AND
-       const char *with _AND
+       char **argz,
+       size_t *argz_len,
+       const char *str,
+       const char *with,
        unsigned *replace_count)
 {
   const int str_len = strlen(str);
diff --git a/newlib/libc/argz/argz_stringify.c b/newlib/libc/argz/argz_stringify.c
index be5f2cf45..72895f5e7 100644
--- a/newlib/libc/argz/argz_stringify.c
+++ b/newlib/libc/argz/argz_stringify.c
@@ -11,8 +11,8 @@
 
 void
 _DEFUN (argz_stringify, (argz, argz_len, sep),
-       char *argz _AND
-       size_t argz_len _AND
+       char *argz,
+       size_t argz_len,
        int sep)
 {
   size_t i;
diff --git a/newlib/libc/argz/envz_add.c b/newlib/libc/argz/envz_add.c
index 3e91a5867..f01d09926 100644
--- a/newlib/libc/argz/envz_add.c
+++ b/newlib/libc/argz/envz_add.c
@@ -13,9 +13,9 @@
 
 error_t
 _DEFUN (envz_add, (envz, envz_len, name, value),
-       char **envz _AND 
-       size_t *envz_len _AND 
-       const char *name _AND
+       char **envz,
+       size_t *envz_len,
+       const char *name,
        const char *value)
 {
   char *concat = NULL;
diff --git a/newlib/libc/argz/envz_entry.c b/newlib/libc/argz/envz_entry.c
index 3d1986ba7..bbe38529e 100644
--- a/newlib/libc/argz/envz_entry.c
+++ b/newlib/libc/argz/envz_entry.c
@@ -14,8 +14,8 @@
 
 char *
 _DEFUN (envz_entry, (envz, envz_len, name),
-       const char *envz _AND
-       size_t envz_len _AND
+       const char *envz,
+       size_t envz_len,
        const char *name)
 {
   char *buf_ptr = (char *)envz;
diff --git a/newlib/libc/argz/envz_get.c b/newlib/libc/argz/envz_get.c
index b4f7c2806..62d3d0cff 100644
--- a/newlib/libc/argz/envz_get.c
+++ b/newlib/libc/argz/envz_get.c
@@ -14,8 +14,8 @@
 
 char *
 _DEFUN (envz_get, (envz, envz_len, name),
-       const char *envz _AND 
-       size_t envz_len _AND
+       const char *envz,
+       size_t envz_len,
        const char *name)
 {
   char *buf_ptr = (char *)envz;
diff --git a/newlib/libc/argz/envz_merge.c b/newlib/libc/argz/envz_merge.c
index 8a26bc3c3..9299069e4 100644
--- a/newlib/libc/argz/envz_merge.c
+++ b/newlib/libc/argz/envz_merge.c
@@ -13,10 +13,10 @@
 
 error_t
 _DEFUN (envz_merge, (envz, envz_len, envz2, envz2_len, override),
-       char **envz _AND
-       size_t *envz_len _AND
-       const char *envz2 _AND
-       size_t envz2_len _AND
+       char **envz,
+       size_t *envz_len,
+       const char *envz2,
+       size_t envz2_len,
        int override)
 {
   char *entry = NULL;
diff --git a/newlib/libc/argz/envz_remove.c b/newlib/libc/argz/envz_remove.c
index 1882297f0..2558656aa 100644
--- a/newlib/libc/argz/envz_remove.c
+++ b/newlib/libc/argz/envz_remove.c
@@ -13,8 +13,8 @@
 
 void
 _DEFUN (envz_remove, (envz, envz_len, name),
-       char **envz _AND
-       size_t *envz_len _AND
+       char **envz,
+       size_t *envz_len,
        const char *name)
 {
   char *entry = NULL;
diff --git a/newlib/libc/argz/envz_strip.c b/newlib/libc/argz/envz_strip.c
index e1c461091..857f8492e 100644
--- a/newlib/libc/argz/envz_strip.c
+++ b/newlib/libc/argz/envz_strip.c
@@ -13,7 +13,7 @@
 
 void
 _DEFUN (envz_strip, (envz, envz_len),
-       char **envz _AND
+       char **envz,
        size_t *envz_len)
 {
   char *entry = 0;