2003-06-06 Jeff Johnston <jjohnstn@redhat.com>

        * libc/argz/argz_add.c: Change to use _DEFUN macro for function
        definition.
        * libc/argz/argz_add_sep.c: Ditto.
        * libc/argz/argz_append.c libc/argz/argz_count.c: Ditto.
        * libc/argz/argz_create.c libc/argz/argz_create_sep.c: Ditto.
        * libc/argz/argz_delete.c libc/argz/argz_extract.c: Ditto.
        * libc/argz/argz_insert.c libc/argz/argz_next.c: Ditto.
        * libc/argz/argz_replace.c libc/argz/argz_stringify.c: Ditto.
        * libc/argz/envz_add.c libc/argz/envz_entry.c: Ditto.
        * libc/argz/envz_get.c libc/argz/envz_merge.c: Ditto.
        * libc/argz/envz_remove.c libc/argz/envz_strip.c: Ditto.
        * libc/locale/nl_langinfo.c libc/misc/ffs.c: Ditto.
        * libc/posix/closedir.c libc/posix/creat.c: Ditto.
        * libc/posix/execl.c libc/posix/execle.c: Ditto.
        * libc/posix/execlp.c libc/posix/execve.c: Ditto.
        * libc/posix/isatty.c libc/posix/opendir.c: Ditto.
        * libc/posix/popen.c libc/posix/readdir.c: Ditto.
        * libc/posix/readdir_r.c libc/posix/rewinddir.c: Ditto.
        * libc/posix/scandir.c libc/posix/seekdir.c: Ditto.
        * libc/posix/telldir.c libc/search/hcreate.c: Ditto.
        * libc/search/tdelete.c libc/search/tdestroy.c: Ditto.
        * libc/search/tfind.c libc/search/tsearch.c: Ditto.
        * libc/search/twalk.c libc/signal/signal.c: Ditto.

18 files changed, 81 insertions, 18 deletions

diff --git a/newlib/libc/argz/argz_add.c b/newlib/libc/argz/argz_add.c
index 80f1951c3..46e71ca37 100644
--- a/newlib/libc/argz/argz_add.c
+++ b/newlib/libc/argz/argz_add.c
@@ -10,7 +10,10 @@
 #include <stdlib.h>
 
 error_t
-argz_add (char **argz, size_t *argz_len, const char *str)
+_DEFUN (argz_add, (argz, argz_len, str),
+       char **argz _AND
+       size_t *argz_len _AND
+       const char *str)
 {
   int len_to_add = 0;
   size_t last = *argz_len;
diff --git a/newlib/libc/argz/argz_add_sep.c b/newlib/libc/argz/argz_add_sep.c
index e17555407..5a56ec931 100644
--- a/newlib/libc/argz/argz_add_sep.c
+++ b/newlib/libc/argz/argz_add_sep.c
@@ -11,7 +11,11 @@
 #include <argz.h>
 
 error_t
-argz_add_sep (char **argz, size_t *argz_len, const char *str, int sep)
+_DEFUN (argz_add_sep, (argz, argz_len, str, sep),
+       char **argz _AND
+       size_t *argz_len _AND
+       const char *str _AND
+       int sep)
 {
   char *str_argz = 0;
   size_t str_argz_len = 0;
diff --git a/newlib/libc/argz/argz_append.c b/newlib/libc/argz/argz_append.c
index 708bc1917..7519e1608 100644
--- a/newlib/libc/argz/argz_append.c
+++ b/newlib/libc/argz/argz_append.c
@@ -10,7 +10,11 @@
 #include <stdlib.h>
 
 error_t
-argz_append (char **argz, size_t *argz_len, const char *buf, size_t buf_len)
+_DEFUN (argz_append, (argz, argz_len, buf, buf_len),
+       char **argz _AND
+       size_t *argz_len _AND
+       const char *buf _AND
+       size_t buf_len)
 {
   size_t last = *argz_len;
 
diff --git a/newlib/libc/argz/argz_count.c b/newlib/libc/argz/argz_count.c
index daecd244c..0c8a816c1 100644
--- a/newlib/libc/argz/argz_count.c
+++ b/newlib/libc/argz/argz_count.c
@@ -4,10 +4,13 @@
  * is freely granted, provided that this notice is preserved.
  */
 
+#include <_ansi.h>
 #include <sys/types.h>
 
 size_t
-argz_count (const char *argz, size_t argz_len)
+_DEFUN (argz_count, (argz, argz_len), 
+       const char *argz _AND
+       size_t argz_len)
 {
   int i;
   size_t count = 0;
diff --git a/newlib/libc/argz/argz_create.c b/newlib/libc/argz/argz_create.c
index 1708a2ede..f5651c618 100644
--- a/newlib/libc/argz/argz_create.c
+++ b/newlib/libc/argz/argz_create.c
@@ -10,7 +10,10 @@
 #include <stdlib.h>
 
 error_t
-argz_create (char *const argv[], char **argz, size_t *argz_len)
+_DEFUN (argz_create, (argv, argz, argz_len),
+       char *const argv[] _AND
+       char **argz _AND
+       size_t *argz_len)
 {
   int argc = 0;
   int i = 0;
diff --git a/newlib/libc/argz/argz_create_sep.c b/newlib/libc/argz/argz_create_sep.c
index f8d9ef1d3..bf0670bda 100644
--- a/newlib/libc/argz/argz_create_sep.c
+++ b/newlib/libc/argz/argz_create_sep.c
@@ -10,7 +10,11 @@
 #include <stdlib.h>
 
 error_t
-argz_create_sep (const char *string, int sep, char **argz, size_t *argz_len)
+_DEFUN (argz_create_sep, (string, sep, argz, argz_len),
+       const char *string _AND
+       int sep _AND
+       char **argz _AND
+       size_t *argz_len)
 {
   int len = 0;
   int i = 0;
diff --git a/newlib/libc/argz/argz_delete.c b/newlib/libc/argz/argz_delete.c
index 47134cbff..237128c88 100644
--- a/newlib/libc/argz/argz_delete.c
+++ b/newlib/libc/argz/argz_delete.c
@@ -10,7 +10,10 @@
 #include <stdlib.h>
 
 error_t
-argz_delete (char **argz, size_t *argz_len, char *entry)
+_DEFUN (argz_delete, (argz, argz_len, entry),
+       char **argz _AND
+       size_t *argz_len _AND
+       char *entry)
 {
   int len = 0;
   char *moveto = entry;
diff --git a/newlib/libc/argz/argz_extract.c b/newlib/libc/argz/argz_extract.c
index 54c1577da..289c6e100 100644
--- a/newlib/libc/argz/argz_extract.c
+++ b/newlib/libc/argz/argz_extract.c
@@ -8,7 +8,10 @@
 #include <sys/types.h>
 
 void
-argz_extract (char *argz, size_t argz_len, char **argv)
+_DEFUN (argz_extract, (argz, argz_len, argv),
+       char *argz _AND
+       size_t argz_len _AND
+       char **argv)
 {
   size_t i = 0;
   int j = 0;
diff --git a/newlib/libc/argz/argz_insert.c b/newlib/libc/argz/argz_insert.c
index af16301c5..043a10193 100644
--- a/newlib/libc/argz/argz_insert.c
+++ b/newlib/libc/argz/argz_insert.c
@@ -11,7 +11,11 @@
 #include <argz.h>
 
 error_t
-argz_insert (char **argz, size_t *argz_len, char *before, const char *entry)
+_DEFUN (argz_insert, (argz, argz_len, before, entry),
+       char **argz _AND
+       size_t *argz_len _AND
+       char *before _AND
+       const char *entry)
 {
   int len = 0;
 
diff --git a/newlib/libc/argz/argz_next.c b/newlib/libc/argz/argz_next.c
index 79da8473e..e9dbe0694 100644
--- a/newlib/libc/argz/argz_next.c
+++ b/newlib/libc/argz/argz_next.c
@@ -10,7 +10,10 @@
 #include <stdlib.h>
 
 char *
-argz_next (char *argz, size_t argz_len, const char *entry)
+_DEFUN (argz_next, (argz, argz_len, entry),
+       char *argz _AND
+       size_t argz_len _AND
+       const char *entry)
 {
   if (entry)
     {
diff --git a/newlib/libc/argz/argz_replace.c b/newlib/libc/argz/argz_replace.c
index cc0d78f5a..cb01eaef5 100644
--- a/newlib/libc/argz/argz_replace.c
+++ b/newlib/libc/argz/argz_replace.c
@@ -13,7 +13,12 @@
 #include "buf_findstr.h"
 
 error_t
-argz_replace (char **argz, size_t *argz_len, const char *str, const char *with, unsigned *replace_count)
+_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
+       unsigned *replace_count)
 {
   const int str_len = strlen(str);
   const int with_len = strlen(with);
diff --git a/newlib/libc/argz/argz_stringify.c b/newlib/libc/argz/argz_stringify.c
index 739c9e1ec..6ff5dd001 100644
--- a/newlib/libc/argz/argz_stringify.c
+++ b/newlib/libc/argz/argz_stringify.c
@@ -4,10 +4,14 @@
  * is freely granted, provided that this notice is preserved.
  */
 
+#include <_ansi.h>
 #include <sys/types.h>
 
 void
-argz_stringify (char *argz, size_t argz_len, int sep)
+_DEFUN (argz_stringify, (argz, argz_len, sep),
+       char *argz _AND
+       size_t argz_len _AND
+       int sep)
 {
   size_t i;
 
diff --git a/newlib/libc/argz/envz_add.c b/newlib/libc/argz/envz_add.c
index 75fba66ed..3e91a5867 100644
--- a/newlib/libc/argz/envz_add.c
+++ b/newlib/libc/argz/envz_add.c
@@ -12,7 +12,11 @@
 #include <envz.h>
 
 error_t
-envz_add (char **envz, size_t *envz_len, const char *name, const char *value)
+_DEFUN (envz_add, (envz, envz_len, name, value),
+       char **envz _AND 
+       size_t *envz_len _AND 
+       const char *name _AND
+       const char *value)
 {
   char *concat = NULL;
   int name_len = 0;
diff --git a/newlib/libc/argz/envz_entry.c b/newlib/libc/argz/envz_entry.c
index 300aec9d5..3d1986ba7 100644
--- a/newlib/libc/argz/envz_entry.c
+++ b/newlib/libc/argz/envz_entry.c
@@ -13,7 +13,10 @@
 #include "buf_findstr.h"
 
 char *
-envz_entry (const char *envz, size_t envz_len, const char *name)
+_DEFUN (envz_entry, (envz, envz_len, name),
+       const char *envz _AND
+       size_t envz_len _AND
+       const char *name)
 {
   char *buf_ptr = (char *)envz;
   size_t buf_len = envz_len;
diff --git a/newlib/libc/argz/envz_get.c b/newlib/libc/argz/envz_get.c
index 718806ec5..b4f7c2806 100644
--- a/newlib/libc/argz/envz_get.c
+++ b/newlib/libc/argz/envz_get.c
@@ -13,7 +13,10 @@
 #include "buf_findstr.h"
 
 char *
-envz_get (const char *envz, size_t envz_len, const char *name)
+_DEFUN (envz_get, (envz, envz_len, name),
+       const char *envz _AND 
+       size_t envz_len _AND
+       const char *name)
 {
   char *buf_ptr = (char *)envz;
   size_t buf_len = envz_len;
diff --git a/newlib/libc/argz/envz_merge.c b/newlib/libc/argz/envz_merge.c
index da2d8cb08..46832202e 100644
--- a/newlib/libc/argz/envz_merge.c
+++ b/newlib/libc/argz/envz_merge.c
@@ -12,7 +12,12 @@
 #include <envz.h>
 
 error_t
-envz_merge (char **envz, size_t *envz_len, const char *envz2, size_t envz2_len, int override)
+_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
+       int override)
 {
   char *entry = NULL;
   char *name_str = NULL;
diff --git a/newlib/libc/argz/envz_remove.c b/newlib/libc/argz/envz_remove.c
index ace547968..1882297f0 100644
--- a/newlib/libc/argz/envz_remove.c
+++ b/newlib/libc/argz/envz_remove.c
@@ -12,7 +12,10 @@
 #include <envz.h>
 
 void
-envz_remove(char **envz, size_t *envz_len, const char *name)
+_DEFUN (envz_remove, (envz, envz_len, name),
+       char **envz _AND
+       size_t *envz_len _AND
+       const char *name)
 {
   char *entry = NULL;
   int len = 0;
diff --git a/newlib/libc/argz/envz_strip.c b/newlib/libc/argz/envz_strip.c
index f190befe8..e1c461091 100644
--- a/newlib/libc/argz/envz_strip.c
+++ b/newlib/libc/argz/envz_strip.c
@@ -12,7 +12,9 @@
 #include <envz.h>
 
 void
-envz_strip (char **envz, size_t *envz_len)
+_DEFUN (envz_strip, (envz, envz_len),
+       char **envz _AND
+       size_t *envz_len)
 {
   char *entry = 0;
   int len = 0;