ansification: remove _AND

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

libgloss/cr16/fstat.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */

libgloss/cr16/isatty.c

@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),

libgloss/cr16/kill.c

@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND 
+        int pid,
         int sig)
 {
   if(pid == __MYPID)

libgloss/cr16/stat.c

@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;

libgloss/crx/fstat.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */

libgloss/crx/isatty.c

@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (isatty, (fd),

libgloss/crx/kill.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (kill, (pid, sig),
-        int pid _AND 
+        int pid,
         int sig)
 {
   if(pid == __MYPID)

libgloss/crx/stat.c

@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;

libgloss/frv/fstat.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */

libgloss/frv/isatty.c

@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),

libgloss/frv/kill.c

@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND 
+        int pid,
         int sig)
 {
   if(pid == __MYPID)

libgloss/frv/sim-time.c

@@ -66,7 +66,7 @@ _DEFUN (_times, _times (buf),
  */
 int
 _DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-	struct timeval *tv _AND
+	struct timeval *tv,
 	void *tzvp)
 {
   struct timezone *tz = tzvp;

libgloss/frv/stat.c

@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;

libgloss/fstat.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */

libgloss/ft32/fstat.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;        /* Always pretend to be a tty */

libgloss/ft32/isatty.c

@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),

libgloss/ft32/kill.c

@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND
+        int pid,
         int sig)
 {
   if(pid == __MYPID)

libgloss/ft32/sim-lseek.S

@@ -23,8 +23,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;

libgloss/ft32/sim-lseek.c

@@ -23,8 +23,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   /*   errno = ESPIPE; */

libgloss/ft32/sim-time.c

@@ -34,7 +34,7 @@ _DEFUN (_times, _times (buf),
  */
 int
 _DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-        struct timeval *tv _AND
+        struct timeval *tv,
         void *tzvp)
 {
   struct timezone *tz = tzvp;

libgloss/ft32/stat.c

@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;

libgloss/isatty.c

@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes, return a 1.
  */
 int
 _DEFUN (isatty, (fd),

libgloss/kill.c

@@ -19,7 +19,7 @@
  */
 int
 _DEFUN (kill, (pid, sig),
-        int pid _AND 
+        int pid,
         int sig)
 {
   if(pid == __MYPID)

libgloss/libnosys/chown.c

@@ -13,8 +13,8 @@ extern int errno;
 
 int
 _DEFUN (_chown, (path, owner, group),
-        const char *path  _AND
-        uid_t owner _AND
+        const char *path,
+        uid_t owner,
         gid_t group)
 {
   errno = ENOSYS;

libgloss/libnosys/execve.c

@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_execve, (name, argv, env),
-        char  *name  _AND
-        char **argv  _AND
+        char  *name,
+        char **argv,
         char **env)
 {
   errno = ENOSYS;

libgloss/libnosys/fstat.c

@@ -14,7 +14,7 @@ extern int errno;
 
 int
 _DEFUN (_fstat, (fildes, st),
-        int          fildes _AND
+        int          fildes,
         struct stat *st)
 {
   errno = ENOSYS;

libgloss/libnosys/gettod.c

@@ -16,7 +16,7 @@ struct timeval;
 
 int
 _DEFUN (_gettimeofday, (ptimeval, ptimezone),
-        struct timeval  *ptimeval  _AND
+        struct timeval  *ptimeval,
         void *ptimezone)
 {
   errno = ENOSYS;

libgloss/libnosys/kill.c

@@ -12,7 +12,7 @@ extern int errno;
 
 int
 _DEFUN (_kill, (pid, sig),
-        int pid  _AND
+        int pid,
         int sig)
 {
   errno = ENOSYS;

libgloss/libnosys/link.c

@@ -12,7 +12,7 @@ extern int errno;
 
 int
 _DEFUN (_link, (existing, new),
-        char *existing _AND
+        char *existing,
         char *new)
 {
   errno = ENOSYS;

libgloss/libnosys/lseek.c

@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_lseek, (file, ptr, dir),
-        int   file  _AND
-        int   ptr   _AND
+        int   file,
+        int   ptr,
         int   dir)
 {
   errno = ENOSYS;

libgloss/libnosys/open.c

@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_open, (file, flags, mode),
-        char *file  _AND
-        int   flags _AND
+        char *file,
+        int   flags,
         int   mode)
 {
   errno = ENOSYS;

libgloss/libnosys/read.c

@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_read, (file, ptr, len),
-        int   file  _AND
-        char *ptr   _AND
+        int   file,
+        char *ptr,
         int   len)
 {
   errno = ENOSYS;

libgloss/libnosys/readlink.c

@@ -13,8 +13,8 @@ extern int errno;
 
 int
 _DEFUN (_readlink, (path, buf, bufsize),
-        const char *path _AND
-        char *buf _AND
+        const char *path,
+        char *buf,
         size_t bufsize)
 {
   errno = ENOSYS;

libgloss/libnosys/stat.c

@@ -14,7 +14,7 @@ extern int errno;
 
 int
 _DEFUN (_stat, (file, st),
-        const char  *file _AND
+        const char  *file,
         struct stat *st)
 {
   errno = ENOSYS;

libgloss/libnosys/symlink.c

@@ -12,7 +12,7 @@ extern int errno;
 
 int
 _DEFUN (_symlink, (path1, path2),
-        const char *path1 _AND
+        const char *path1,
         const char *path2)
 {
   errno = ENOSYS;

libgloss/libnosys/write.c

@@ -12,8 +12,8 @@ extern int errno;
 
 int
 _DEFUN (_write, (file, ptr, len),
-        int   file  _AND
-        char *ptr   _AND
+        int   file,
+        char *ptr,
         int   len)
 {
   errno = ENOSYS;

libgloss/lseek.c

@@ -21,8 +21,8 @@
  */
 off_t
 _DEFUN (lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;

libgloss/mcore/fstat.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */

libgloss/mcore/kill.c

@@ -19,7 +19,7 @@
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND 
+        int pid,
         int sig)
 {
   if(pid == __MYPID)

libgloss/mcore/lseek.c

@@ -21,8 +21,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;

libgloss/mcore/open.c

@@ -21,8 +21,8 @@
  */
 int
 _DEFUN (_open, (buf, flags, mode),
-       const char *buf _AND
-       int flags _AND
+       const char *buf,
+       int flags,
        int mode)
 {
   errno = EIO;

libgloss/mcore/read.c

@@ -22,8 +22,8 @@ extern char _DEFUN_VOID (inbyte);
  */
 int
 _DEFUN (_read, (fd, buf, nbytes),
-       int fd _AND
-       char *buf _AND
+       int fd,
+       char *buf,
        int nbytes)
 {
   int i = 0;

libgloss/mcore/stat.c

@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;

libgloss/mcore/write.c

@@ -23,8 +23,8 @@ extern int  _EXFUN (outbyte, (char x));
  */
 int
 _DEFUN (_write, (fd, buf, nbytes),
-       int fd _AND
-       char *buf _AND
+       int fd,
+       char *buf,
        int nbytes)
 {
   int i;

libgloss/moxie/fstat.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */

libgloss/moxie/isatty.c

@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),

libgloss/moxie/kill.c

@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND 
+        int pid,
         int sig)
 {
   if(pid == __MYPID)

libgloss/moxie/qemu-time.c

@@ -101,7 +101,7 @@ _DEFUN (time, time (t),
  */
 int
 _DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-	struct timeval *tv _AND
+	struct timeval *tv,
 	void *tzvp)
 {
   struct timezone *tz = tzvp;

libgloss/moxie/sim-lseek.S

@@ -23,8 +23,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;

libgloss/moxie/sim-lseek.c

@@ -23,8 +23,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   /*   errno = ESPIPE; */

libgloss/moxie/sim-time.c

@@ -65,7 +65,7 @@ _DEFUN (_times, _times (buf),
  */
 int
 _DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-	struct timeval *tv _AND
+	struct timeval *tv,
 	void *tzvp)
 {
   struct timezone *tz = tzvp;

libgloss/moxie/stat.c

@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;

libgloss/open.c

@@ -21,8 +21,8 @@
  */
 int
 _DEFUN (open, (buf, flags, mode),
-       const char *buf _AND
-       int flags _AND
+       const char *buf,
+       int flags,
        int mode)
 {
   errno = EIO;

libgloss/read.c

@@ -22,8 +22,8 @@ extern char _DEFUN_VOID (inbyte);
  */
 int
 _DEFUN (read, (fd, buf, nbytes),
-       int fd _AND
-       char *buf _AND
+       int fd,
+       char *buf,
        int nbytes)
 {
   int i = 0;

libgloss/stat.c

@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;

libgloss/tic6x/kill.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (kill, (pid, sig),
-        int pid _AND 
+        int pid,
         int sig)
 {
   if(pid == __MYPID)

libgloss/write.c

@@ -23,8 +23,8 @@ extern int  _EXFUN (outbyte, (char x));
  */
 int
 _DEFUN (write, (fd, buf, nbytes),
-       int fd _AND
-       char *buf _AND
+       int fd,
+       char *buf,
        int nbytes)
 {
   int i;

libgloss/xc16x/misc.c

@@ -31,7 +31,7 @@ int _DEFUN(_getpid,(),)
 }
 
 int _DEFUN(_kill,(pid, sig),
-	   int pid _AND
+	   int pid,
 	   int sig)
 {
   errno = ENOSYS;

libgloss/xstormy16/fstat.c

@@ -20,7 +20,7 @@
  */
 int
 _DEFUN (_fstat, (fd, buf),
-       int fd _AND
+       int fd,
        struct stat *buf)
 {
   buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */

libgloss/xstormy16/isatty.c

@@ -17,7 +17,7 @@
 /*
  * isatty -- returns 1 if connected to a terminal device,
  *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
+ *           serial port, we'll say yes and return a 1.
  */
 int
 _DEFUN (_isatty, (fd),

libgloss/xstormy16/kill.c

@@ -19,7 +19,7 @@
  */
 int
 _DEFUN (_kill, (pid, sig),
-        int pid _AND 
+        int pid,
         int sig)
 {
   if(pid == __MYPID)

libgloss/xstormy16/lseek.c

@@ -21,8 +21,8 @@
  */
 off_t
 _DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
+       int fd,
+       off_t offset,
        int whence)
 {
   errno = ESPIPE;

libgloss/xstormy16/open.c

@@ -21,8 +21,8 @@
  */
 int
 _DEFUN (_open, (buf, flags, mode),
-       const char *buf _AND
-       int flags _AND
+       const char *buf,
+       int flags,
        int mode)
 {
   errno = EIO;

libgloss/xstormy16/stat.c

@@ -21,7 +21,7 @@
  */
 int
 _DEFUN (_stat, (path, buf),
-       const char *path _AND
+       const char *path,
        struct stat *buf)
 {
   errno = EIO;