From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 75865 invoked by alias); 17 Jan 2018 17:48:54 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 75810 invoked by uid 9642); 17 Jan 2018 17:48:53 -0000 Date: Wed, 17 Jan 2018 17:48:00 -0000 Message-ID: <20180117174853.75808.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Yaakov Selkowitz To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] ansification: remove _AND X-Act-Checkin: newlib-cygwin X-Git-Author: Yaakov Selkowitz X-Git-Refname: refs/heads/master X-Git-Oldrev: 1e39db3062f941778e748f833e1f88dd5c7399a3 X-Git-Newrev: 6783860a2e4e4183c073f62e4bb938cea0e096c3 X-SW-Source: 2018-q1/txt/msg00004.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6783860a2e4e4183c073f62e4bb938cea0e096c3 commit 6783860a2e4e4183c073f62e4bb938cea0e096c3 Author: Yaakov Selkowitz Date: Sun Dec 3 19:31:41 2017 -0600 ansification: remove _AND Signed-off-by: Yaakov Selkowitz Diff: --- libgloss/cr16/fstat.c | 2 +- libgloss/cr16/isatty.c | 2 +- libgloss/cr16/kill.c | 2 +- libgloss/cr16/stat.c | 2 +- libgloss/crx/fstat.c | 2 +- libgloss/crx/isatty.c | 2 +- libgloss/crx/kill.c | 2 +- libgloss/crx/stat.c | 2 +- libgloss/frv/fstat.c | 2 +- libgloss/frv/isatty.c | 2 +- libgloss/frv/kill.c | 2 +- libgloss/frv/sim-time.c | 2 +- libgloss/frv/stat.c | 2 +- libgloss/fstat.c | 2 +- libgloss/ft32/fstat.c | 2 +- libgloss/ft32/isatty.c | 2 +- libgloss/ft32/kill.c | 2 +- libgloss/ft32/sim-lseek.S | 4 +- libgloss/ft32/sim-lseek.c | 4 +- libgloss/ft32/sim-time.c | 2 +- libgloss/ft32/stat.c | 2 +- libgloss/isatty.c | 2 +- libgloss/kill.c | 2 +- libgloss/libnosys/chown.c | 4 +- libgloss/libnosys/execve.c | 4 +- libgloss/libnosys/fstat.c | 2 +- libgloss/libnosys/gettod.c | 2 +- libgloss/libnosys/kill.c | 2 +- libgloss/libnosys/link.c | 2 +- libgloss/libnosys/lseek.c | 4 +- libgloss/libnosys/open.c | 4 +- libgloss/libnosys/read.c | 4 +- libgloss/libnosys/readlink.c | 4 +- libgloss/libnosys/stat.c | 2 +- libgloss/libnosys/symlink.c | 2 +- libgloss/libnosys/write.c | 4 +- libgloss/lseek.c | 4 +- libgloss/mcore/fstat.c | 2 +- libgloss/mcore/kill.c | 2 +- libgloss/mcore/lseek.c | 4 +- libgloss/mcore/open.c | 4 +- libgloss/mcore/read.c | 4 +- libgloss/mcore/stat.c | 2 +- libgloss/mcore/write.c | 4 +- libgloss/moxie/fstat.c | 2 +- libgloss/moxie/isatty.c | 2 +- libgloss/moxie/kill.c | 2 +- libgloss/moxie/qemu-time.c | 2 +- libgloss/moxie/sim-lseek.S | 4 +- libgloss/moxie/sim-lseek.c | 4 +- libgloss/moxie/sim-time.c | 2 +- libgloss/moxie/stat.c | 2 +- libgloss/open.c | 4 +- libgloss/read.c | 4 +- libgloss/stat.c | 2 +- libgloss/tic6x/kill.c | 2 +- libgloss/write.c | 4 +- libgloss/xc16x/misc.c | 2 +- libgloss/xstormy16/fstat.c | 2 +- libgloss/xstormy16/isatty.c | 2 +- libgloss/xstormy16/kill.c | 2 +- libgloss/xstormy16/lseek.c | 4 +- libgloss/xstormy16/open.c | 4 +- libgloss/xstormy16/stat.c | 2 +- newlib/libc/argz/argz_add.c | 4 +- newlib/libc/argz/argz_add_sep.c | 6 +-- newlib/libc/argz/argz_append.c | 6 +-- newlib/libc/argz/argz_count.c | 2 +- newlib/libc/argz/argz_create.c | 4 +- newlib/libc/argz/argz_create_sep.c | 6 +-- newlib/libc/argz/argz_delete.c | 4 +- newlib/libc/argz/argz_extract.c | 4 +- newlib/libc/argz/argz_insert.c | 6 +-- newlib/libc/argz/argz_next.c | 4 +- newlib/libc/argz/argz_replace.c | 8 ++-- newlib/libc/argz/argz_stringify.c | 4 +- newlib/libc/argz/envz_add.c | 6 +-- newlib/libc/argz/envz_entry.c | 4 +- newlib/libc/argz/envz_get.c | 4 +- newlib/libc/argz/envz_merge.c | 8 ++-- newlib/libc/argz/envz_remove.c | 4 +- newlib/libc/argz/envz_strip.c | 2 +- newlib/libc/ctype/iswctype.c | 2 +- newlib/libc/ctype/jp2uc.c | 2 +- newlib/libc/ctype/towctrans.c | 6 +-- newlib/libc/ctype/wctrans.c | 2 +- newlib/libc/ctype/wctype.c | 2 +- newlib/libc/iconv/ces/euc.c | 18 +++---- newlib/libc/iconv/ces/table-pcs.c | 18 +++---- newlib/libc/iconv/ces/table.c | 26 +++++----- newlib/libc/iconv/ces/ucs-2-internal.c | 10 ++-- newlib/libc/iconv/ces/ucs-2.c | 14 +++--- newlib/libc/iconv/ces/ucs-4-internal.c | 10 ++-- newlib/libc/iconv/ces/ucs-4.c | 14 +++--- newlib/libc/iconv/ces/us-ascii.c | 10 ++-- newlib/libc/iconv/ces/utf-16.c | 16 +++---- newlib/libc/iconv/ces/utf-8.c | 10 ++-- newlib/libc/iconv/lib/aliasesi.c | 10 ++-- newlib/libc/iconv/lib/iconv.c | 26 +++++----- newlib/libc/iconv/lib/iconvnls.c | 40 ++++++++-------- newlib/libc/iconv/lib/nullconv.c | 30 ++++++------ newlib/libc/iconv/lib/ucsconv.c | 32 ++++++------- newlib/libc/include/_ansi.h | 2 - newlib/libc/locale/locale.c | 6 +-- newlib/libc/machine/microblaze/strcmp.c | 2 +- newlib/libc/machine/microblaze/strcpy.c | 2 +- newlib/libc/machine/powerpc/atosfix16.c | 2 +- newlib/libc/machine/powerpc/atosfix32.c | 2 +- newlib/libc/machine/powerpc/atosfix64.c | 2 +- newlib/libc/machine/powerpc/atoufix16.c | 2 +- newlib/libc/machine/powerpc/atoufix32.c | 2 +- newlib/libc/machine/powerpc/atoufix64.c | 2 +- newlib/libc/machine/powerpc/strtosfix16.c | 6 +-- newlib/libc/machine/powerpc/strtosfix32.c | 6 +-- newlib/libc/machine/powerpc/strtosfix64.c | 6 +-- newlib/libc/machine/powerpc/strtoufix16.c | 6 +-- newlib/libc/machine/powerpc/strtoufix32.c | 6 +-- newlib/libc/machine/powerpc/strtoufix64.c | 6 +-- newlib/libc/machine/powerpc/ufix64toa.c | 12 ++--- newlib/libc/machine/powerpc/vec_calloc.c | 2 +- newlib/libc/machine/powerpc/vec_realloc.c | 2 +- newlib/libc/machine/powerpc/vfprintf.c | 10 ++-- newlib/libc/machine/powerpc/vfscanf.c | 10 ++-- newlib/libc/machine/spu/assert.c | 10 ++-- newlib/libc/machine/spu/creat.c | 2 +- newlib/libc/machine/spu/fdopen.c | 2 +- newlib/libc/machine/spu/fgetpos.c | 2 +- newlib/libc/machine/spu/fgets.c | 4 +- newlib/libc/machine/spu/fopen.c | 2 +- newlib/libc/machine/spu/fputs.c | 2 +- newlib/libc/machine/spu/fread.c | 6 +-- newlib/libc/machine/spu/freopen.c | 4 +- newlib/libc/machine/spu/fseek.c | 4 +- newlib/libc/machine/spu/fsetpos.c | 2 +- newlib/libc/machine/spu/fwrite.c | 6 +-- newlib/libc/machine/spu/setbuf.c | 2 +- newlib/libc/machine/spu/setvbuf.c | 6 +-- newlib/libc/machine/spu/vfprintf.c | 4 +- newlib/libc/machine/spu/vfscanf.c | 4 +- newlib/libc/machine/spu/vprintf.c | 2 +- newlib/libc/machine/spu/vscanf.c | 2 +- newlib/libc/machine/spu/vsnprintf.c | 6 +-- newlib/libc/machine/spu/vsprintf.c | 4 +- newlib/libc/machine/spu/vsscanf.c | 4 +- newlib/libc/misc/__dprintf.c | 8 ++-- newlib/libc/posix/creat.c | 2 +- newlib/libc/posix/execl.c | 6 +-- newlib/libc/posix/execle.c | 6 +-- newlib/libc/posix/execlp.c | 6 +-- newlib/libc/posix/execv.c | 2 +- newlib/libc/posix/execve.c | 4 +- newlib/libc/posix/execvp.c | 6 +-- newlib/libc/posix/popen.c | 2 +- newlib/libc/posix/posix_spawn.c | 58 +++++++++++----------- newlib/libc/posix/readdir_r.c | 4 +- newlib/libc/posix/scandir.c | 8 ++-- newlib/libc/posix/seekdir.c | 2 +- newlib/libc/posix/telldir.c | 2 +- newlib/libc/reent/execr.c | 8 ++-- newlib/libc/reent/fcntlr.c | 6 +-- newlib/libc/reent/fstat64r.c | 4 +- newlib/libc/reent/gettimeofdayr.c | 4 +- newlib/libc/reent/linkr.c | 4 +- newlib/libc/reent/lseek64r.c | 6 +-- newlib/libc/reent/lseekr.c | 6 +-- newlib/libc/reent/mkdirr.c | 4 +- newlib/libc/reent/openr.c | 6 +-- newlib/libc/reent/readr.c | 6 +-- newlib/libc/reent/reent.c | 2 +- newlib/libc/reent/renamer.c | 4 +- newlib/libc/reent/sbrkr.c | 2 +- newlib/libc/reent/signalr.c | 4 +- newlib/libc/reent/stat64r.c | 4 +- newlib/libc/reent/statr.c | 4 +- newlib/libc/reent/timesr.c | 2 +- newlib/libc/reent/unlinkr.c | 2 +- newlib/libc/reent/writer.c | 6 +-- newlib/libc/search/bsearch.c | 8 ++-- newlib/libc/search/hash.c | 8 ++-- newlib/libc/search/hcreate.c | 2 +- newlib/libc/search/qsort.c | 36 +++++++------- newlib/libc/search/tdelete.c | 4 +- newlib/libc/search/tdestroy.c | 2 +- newlib/libc/search/tfind.c | 4 +- newlib/libc/search/tsearch.c | 4 +- newlib/libc/search/twalk.c | 2 +- newlib/libc/signal/psignal.c | 2 +- newlib/libc/signal/raise.c | 2 +- newlib/libc/signal/signal.c | 10 ++-- newlib/libc/stdio/asiprintf.c | 6 +-- newlib/libc/stdio/asniprintf.c | 10 ++-- newlib/libc/stdio/asnprintf.c | 10 ++-- newlib/libc/stdio/asprintf.c | 6 +-- newlib/libc/stdio/diprintf.c | 6 +-- newlib/libc/stdio/dprintf.c | 6 +-- newlib/libc/stdio/fclose.c | 2 +- newlib/libc/stdio/fdopen.c | 6 +-- newlib/libc/stdio/fflush.c | 6 +-- newlib/libc/stdio/fgetc.c | 2 +- newlib/libc/stdio/fgetc_u.c | 2 +- newlib/libc/stdio/fgetpos.c | 6 +-- newlib/libc/stdio/fgets.c | 10 ++-- newlib/libc/stdio/fgetwc.c | 4 +- newlib/libc/stdio/fgetwc_u.c | 2 +- newlib/libc/stdio/fgetws.c | 10 ++-- newlib/libc/stdio/findfp.c | 6 +-- newlib/libc/stdio/fiprintf.c | 6 +-- newlib/libc/stdio/flags.c | 4 +- newlib/libc/stdio/fmemopen.c | 36 +++++++------- newlib/libc/stdio/fopen.c | 6 +-- newlib/libc/stdio/fopencookie.c | 36 +++++++------- newlib/libc/stdio/fprintf.c | 6 +-- newlib/libc/stdio/fpurge.c | 2 +- newlib/libc/stdio/fputc.c | 6 +-- newlib/libc/stdio/fputc_u.c | 6 +-- newlib/libc/stdio/fputs.c | 6 +-- newlib/libc/stdio/fputwc.c | 10 ++-- newlib/libc/stdio/fputwc_u.c | 6 +-- newlib/libc/stdio/fputws.c | 6 +-- newlib/libc/stdio/fread.c | 22 ++++----- newlib/libc/stdio/freopen.c | 10 ++-- newlib/libc/stdio/fseek.c | 10 ++-- newlib/libc/stdio/fseeko.c | 10 ++-- newlib/libc/stdio/fsetlocking.c | 2 +- newlib/libc/stdio/fsetpos.c | 6 +-- newlib/libc/stdio/ftell.c | 2 +- newlib/libc/stdio/ftello.c | 2 +- newlib/libc/stdio/funopen.c | 44 ++++++++--------- newlib/libc/stdio/fvwrite.c | 4 +- newlib/libc/stdio/fwalk.c | 4 +- newlib/libc/stdio/fwide.c | 6 +-- newlib/libc/stdio/fwprintf.c | 6 +-- newlib/libc/stdio/fwrite.c | 14 +++--- newlib/libc/stdio/getc.c | 2 +- newlib/libc/stdio/getc_u.c | 2 +- newlib/libc/stdio/getdelim.c | 6 +-- newlib/libc/stdio/getline.c | 4 +- newlib/libc/stdio/gets.c | 2 +- newlib/libc/stdio/getwc.c | 2 +- newlib/libc/stdio/getwc_u.c | 2 +- newlib/libc/stdio/iprintf.c | 2 +- newlib/libc/stdio/makebuf.c | 8 ++-- newlib/libc/stdio/mktemp.c | 38 +++++++-------- newlib/libc/stdio/nano-vfprintf.c | 34 ++++++------- newlib/libc/stdio/nano-vfscanf.c | 26 +++++----- newlib/libc/stdio/open_memstream.c | 38 +++++++-------- newlib/libc/stdio/perror.c | 2 +- newlib/libc/stdio/printf.c | 2 +- newlib/libc/stdio/putc.c | 6 +-- newlib/libc/stdio/putc_u.c | 6 +-- newlib/libc/stdio/putchar.c | 2 +- newlib/libc/stdio/putchar_u.c | 2 +- newlib/libc/stdio/puts.c | 2 +- newlib/libc/stdio/putw.c | 2 +- newlib/libc/stdio/putwc.c | 6 +-- newlib/libc/stdio/putwc_u.c | 6 +-- newlib/libc/stdio/putwchar.c | 2 +- newlib/libc/stdio/putwchar_u.c | 2 +- newlib/libc/stdio/refill.c | 2 +- newlib/libc/stdio/remove.c | 2 +- newlib/libc/stdio/rename.c | 2 +- newlib/libc/stdio/rewind.c | 2 +- newlib/libc/stdio/rget.c | 2 +- newlib/libc/stdio/sccl.c | 2 +- newlib/libc/stdio/setbuf.c | 2 +- newlib/libc/stdio/setbuffer.c | 4 +- newlib/libc/stdio/setvbuf.c | 6 +-- newlib/libc/stdio/siprintf.c | 6 +-- newlib/libc/stdio/siscanf.c | 6 +-- newlib/libc/stdio/sniprintf.c | 10 ++-- newlib/libc/stdio/snprintf.c | 10 ++-- newlib/libc/stdio/sprintf.c | 6 +-- newlib/libc/stdio/sscanf.c | 6 +-- newlib/libc/stdio/stdio.c | 26 +++++----- newlib/libc/stdio/swprintf.c | 10 ++-- newlib/libc/stdio/tmpnam.c | 18 +++---- newlib/libc/stdio/ungetc.c | 8 ++-- newlib/libc/stdio/ungetwc.c | 6 +-- newlib/libc/stdio/vasiprintf.c | 10 ++-- newlib/libc/stdio/vasniprintf.c | 14 +++--- newlib/libc/stdio/vasnprintf.c | 14 +++--- newlib/libc/stdio/vasprintf.c | 10 ++-- newlib/libc/stdio/vdiprintf.c | 10 ++-- newlib/libc/stdio/vdprintf.c | 10 ++-- newlib/libc/stdio/vfprintf.c | 50 +++++++++---------- newlib/libc/stdio/vfscanf.c | 34 ++++++------- newlib/libc/stdio/vfwprintf.c | 30 ++++++------ newlib/libc/stdio/vfwscanf.c | 26 +++++----- newlib/libc/stdio/viprintf.c | 6 +-- newlib/libc/stdio/viscanf.c | 6 +-- newlib/libc/stdio/vprintf.c | 6 +-- newlib/libc/stdio/vscanf.c | 6 +-- newlib/libc/stdio/vsiprintf.c | 10 ++-- newlib/libc/stdio/vsiscanf.c | 10 ++-- newlib/libc/stdio/vsniprintf.c | 14 +++--- newlib/libc/stdio/vsnprintf.c | 14 +++--- newlib/libc/stdio/vsprintf.c | 10 ++-- newlib/libc/stdio/vsscanf.c | 10 ++-- newlib/libc/stdio/vswprintf.c | 14 +++--- newlib/libc/stdio/vwprintf.c | 6 +-- newlib/libc/stdio/wbuf.c | 6 +-- newlib/libc/stdio/wprintf.c | 2 +- newlib/libc/stdio/wsetup.c | 2 +- newlib/libc/stdio64/fdopen64.c | 6 +-- newlib/libc/stdio64/fgetpos64.c | 6 +-- newlib/libc/stdio64/fopen64.c | 6 +-- newlib/libc/stdio64/freopen64.c | 10 ++-- newlib/libc/stdio64/fseeko64.c | 10 ++-- newlib/libc/stdio64/fsetpos64.c | 6 +-- newlib/libc/stdio64/ftello64.c | 2 +- newlib/libc/stdio64/stdio64.c | 12 ++--- newlib/libc/stdlib/__adjust.c | 6 +-- newlib/libc/stdlib/__atexit.c | 6 +-- newlib/libc/stdlib/__call_atexit.c | 2 +- newlib/libc/stdlib/__ten_mu.c | 2 +- newlib/libc/stdlib/assert.c | 10 ++-- newlib/libc/stdlib/atoi.c | 2 +- newlib/libc/stdlib/atol.c | 2 +- newlib/libc/stdlib/atoll.c | 2 +- newlib/libc/stdlib/calloc.c | 2 +- newlib/libc/stdlib/cxa_atexit.c | 4 +- newlib/libc/stdlib/div.c | 2 +- newlib/libc/stdlib/dtoa.c | 14 +++--- newlib/libc/stdlib/dtoastub.c | 10 ++-- newlib/libc/stdlib/ecvtbuf.c | 60 +++++++++++------------ newlib/libc/stdlib/efgcvt.c | 32 ++++++------- newlib/libc/stdlib/erand48.c | 2 +- newlib/libc/stdlib/gdtoa-gethex.c | 4 +- newlib/libc/stdlib/gdtoa-hexnan.c | 10 ++-- newlib/libc/stdlib/getenv.c | 2 +- newlib/libc/stdlib/getenv_r.c | 6 +-- newlib/libc/stdlib/itoa.c | 8 ++-- newlib/libc/stdlib/jrand48.c | 2 +- newlib/libc/stdlib/l64a.c | 2 +- newlib/libc/stdlib/lcong48.c | 2 +- newlib/libc/stdlib/ldiv.c | 2 +- newlib/libc/stdlib/lldiv.c | 2 +- newlib/libc/stdlib/malign.c | 2 +- newlib/libc/stdlib/mblen.c | 2 +- newlib/libc/stdlib/mblen_r.c | 6 +-- newlib/libc/stdlib/mbrtowc.c | 14 +++--- newlib/libc/stdlib/mbsnrtowcs.c | 18 +++---- newlib/libc/stdlib/mbsrtowcs.c | 14 +++--- newlib/libc/stdlib/mbstowcs.c | 4 +- newlib/libc/stdlib/mbstowcs_r.c | 8 ++-- newlib/libc/stdlib/mbtowc.c | 4 +- newlib/libc/stdlib/mbtowc_r.c | 48 +++++++++---------- newlib/libc/stdlib/mprec.c | 48 +++++++++---------- newlib/libc/stdlib/mstats.c | 4 +- newlib/libc/stdlib/nrand48.c | 2 +- newlib/libc/stdlib/on_exit.c | 2 +- newlib/libc/stdlib/putenv_r.c | 2 +- newlib/libc/stdlib/rand48.c | 2 +- newlib/libc/stdlib/realloc.c | 2 +- newlib/libc/stdlib/reallocf.c | 6 +-- newlib/libc/stdlib/seed48.c | 2 +- newlib/libc/stdlib/setenv.c | 4 +- newlib/libc/stdlib/setenv_r.c | 8 ++-- newlib/libc/stdlib/srand48.c | 2 +- newlib/libc/stdlib/strtod.c | 16 +++---- newlib/libc/stdlib/strtol.c | 10 ++-- newlib/libc/stdlib/strtoll.c | 10 ++-- newlib/libc/stdlib/strtoul.c | 10 ++-- newlib/libc/stdlib/strtoull.c | 10 ++-- newlib/libc/stdlib/system.c | 8 ++-- newlib/libc/stdlib/utoa.c | 8 ++-- newlib/libc/stdlib/wcrtomb.c | 10 ++-- newlib/libc/stdlib/wcsnrtombs.c | 18 +++---- newlib/libc/stdlib/wcsrtombs.c | 14 +++--- newlib/libc/stdlib/wcstod.c | 12 ++--- newlib/libc/stdlib/wcstol.c | 10 ++-- newlib/libc/stdlib/wcstoll.c | 10 ++-- newlib/libc/stdlib/wcstombs.c | 4 +- newlib/libc/stdlib/wcstombs_r.c | 8 ++-- newlib/libc/stdlib/wcstoul.c | 10 ++-- newlib/libc/stdlib/wcstoull.c | 10 ++-- newlib/libc/stdlib/wctomb.c | 2 +- newlib/libc/stdlib/wctomb_r.c | 36 +++++++------- newlib/libc/string/bcmp.c | 4 +- newlib/libc/string/bcopy.c | 4 +- newlib/libc/string/index.c | 2 +- newlib/libc/string/memccpy.c | 6 +-- newlib/libc/string/memchr.c | 4 +- newlib/libc/string/memcmp.c | 4 +- newlib/libc/string/memcpy.c | 4 +- newlib/libc/string/memmem.c | 6 +-- newlib/libc/string/memmove.c | 4 +- newlib/libc/string/mempcpy.c | 4 +- newlib/libc/string/memrchr.c | 4 +- newlib/libc/string/memset.c | 4 +- newlib/libc/string/rawmemchr.c | 2 +- newlib/libc/string/rindex.c | 2 +- newlib/libc/string/stpcpy.c | 2 +- newlib/libc/string/stpncpy.c | 4 +- newlib/libc/string/strcasecmp.c | 2 +- newlib/libc/string/strcasestr.c | 2 +- newlib/libc/string/strcat.c | 2 +- newlib/libc/string/strchr.c | 2 +- newlib/libc/string/strchrnul.c | 2 +- newlib/libc/string/strcmp.c | 2 +- newlib/libc/string/strcoll.c | 2 +- newlib/libc/string/strcpy.c | 2 +- newlib/libc/string/strcspn.c | 2 +- newlib/libc/string/strdup_r.c | 2 +- newlib/libc/string/strerror.c | 6 +-- newlib/libc/string/strerror_r.c | 4 +- newlib/libc/string/strlcat.c | 4 +- newlib/libc/string/strlcpy.c | 4 +- newlib/libc/string/strncasecmp.c | 4 +- newlib/libc/string/strncat.c | 4 +- newlib/libc/string/strncmp.c | 4 +- newlib/libc/string/strncpy.c | 4 +- newlib/libc/string/strndup.c | 2 +- newlib/libc/string/strndup_r.c | 4 +- newlib/libc/string/strnlen.c | 2 +- newlib/libc/string/strpbrk.c | 2 +- newlib/libc/string/strrchr.c | 2 +- newlib/libc/string/strsep.c | 2 +- newlib/libc/string/strspn.c | 2 +- newlib/libc/string/strstr.c | 2 +- newlib/libc/string/strtok.c | 2 +- newlib/libc/string/strtok_r.c | 10 ++-- newlib/libc/string/strxfrm.c | 4 +- newlib/libc/string/swab.c | 4 +- newlib/libc/string/u_strerr.c | 4 +- newlib/libc/string/wcpcpy.c | 2 +- newlib/libc/string/wcpncpy.c | 4 +- newlib/libc/string/wcscasecmp.c | 2 +- newlib/libc/string/wcscat.c | 2 +- newlib/libc/string/wcschr.c | 2 +- newlib/libc/string/wcscmp.c | 2 +- newlib/libc/string/wcscoll.c | 2 +- newlib/libc/string/wcscpy.c | 2 +- newlib/libc/string/wcscspn.c | 2 +- newlib/libc/string/wcslcat.c | 4 +- newlib/libc/string/wcslcpy.c | 4 +- newlib/libc/string/wcsncasecmp.c | 4 +- newlib/libc/string/wcsncat.c | 4 +- newlib/libc/string/wcsncmp.c | 4 +- newlib/libc/string/wcsncpy.c | 4 +- newlib/libc/string/wcsnlen.c | 2 +- newlib/libc/string/wcspbrk.c | 2 +- newlib/libc/string/wcsrchr.c | 2 +- newlib/libc/string/wcsspn.c | 2 +- newlib/libc/string/wcsstr.c | 2 +- newlib/libc/string/wcstok.c | 4 +- newlib/libc/string/wcswidth.c | 2 +- newlib/libc/string/wcsxfrm.c | 4 +- newlib/libc/string/wmemchr.c | 4 +- newlib/libc/string/wmemcmp.c | 4 +- newlib/libc/string/wmemcpy.c | 4 +- newlib/libc/string/wmemmove.c | 4 +- newlib/libc/string/wmempcpy.c | 4 +- newlib/libc/string/wmemset.c | 4 +- newlib/libc/string/xpg_strerror_r.c | 4 +- newlib/libc/sys/a29khif/kill.c | 2 +- newlib/libc/sys/h8300hms/misc.c | 2 +- newlib/libc/sys/h8500hms/misc.c | 2 +- newlib/libc/sys/linux/pread.c | 14 +++--- newlib/libc/sys/linux/pread64.c | 6 +-- newlib/libc/sys/linux/pwrite.c | 14 +++--- newlib/libc/sys/linux/pwrite64.c | 6 +-- newlib/libc/sys/sysnec810/misc.c | 2 +- newlib/libc/syscalls/sysexecve.c | 4 +- newlib/libc/syscalls/sysfcntl.c | 4 +- newlib/libc/syscalls/sysfstat.c | 2 +- newlib/libc/syscalls/sysgettod.c | 2 +- newlib/libc/syscalls/syskill.c | 2 +- newlib/libc/syscalls/syslink.c | 2 +- newlib/libc/syscalls/syslseek.c | 4 +- newlib/libc/syscalls/sysopen.c | 2 +- newlib/libc/syscalls/sysread.c | 4 +- newlib/libc/syscalls/sysstat.c | 2 +- newlib/libc/syscalls/syswrite.c | 4 +- newlib/libc/time/asctime_r.c | 2 +- newlib/libc/time/ctime_r.c | 2 +- newlib/libc/time/difftime.c | 2 +- newlib/libc/time/gmtime_r.c | 2 +- newlib/libc/time/lcltime_r.c | 2 +- newlib/libc/time/strftime.c | 6 +-- newlib/libc/unix/pread.c | 14 +++--- newlib/libc/unix/pwrite.c | 14 +++--- newlib/libc/unix/ttyname_r.c | 4 +- newlib/libc/xdr/xdr.c | 80 +++++++++++++++---------------- newlib/libc/xdr/xdr_array.c | 18 +++---- newlib/libc/xdr/xdr_float.c | 4 +- newlib/libc/xdr/xdr_float_vax.c | 4 +- newlib/libc/xdr/xdr_mem.c | 36 +++++++------- newlib/libc/xdr/xdr_private.c | 2 +- newlib/libc/xdr/xdr_rec.c | 48 +++++++++---------- newlib/libc/xdr/xdr_reference.c | 12 ++--- newlib/libc/xdr/xdr_sizeof.c | 14 +++--- newlib/libc/xdr/xdr_stdio.c | 24 +++++----- newlib/libm/mathfp/s_asine.c | 2 +- newlib/libm/mathfp/s_atan2.c | 2 +- newlib/libm/mathfp/s_atangent.c | 6 +-- newlib/libm/mathfp/s_ldexp.c | 2 +- newlib/libm/mathfp/s_logarithm.c | 2 +- newlib/libm/mathfp/s_sincos.c | 4 +- newlib/libm/mathfp/s_sine.c | 2 +- newlib/libm/mathfp/s_sineh.c | 2 +- newlib/libm/mathfp/sf_asine.c | 2 +- newlib/libm/mathfp/sf_atan2.c | 2 +- newlib/libm/mathfp/sf_atangent.c | 6 +-- newlib/libm/mathfp/sf_fmod.c | 2 +- newlib/libm/mathfp/sf_ldexp.c | 2 +- newlib/libm/mathfp/sf_logarithm.c | 2 +- newlib/libm/mathfp/sf_sincos.c | 4 +- newlib/libm/mathfp/sf_sine.c | 2 +- newlib/libm/mathfp/sf_sineh.c | 2 +- newlib/libm/test/convert.c | 10 ++-- newlib/libm/test/dcvt.c | 42 ++++++++-------- newlib/libm/test/math.c | 44 ++++++++--------- newlib/libm/test/string.c | 10 ++-- newlib/libm/test/test.c | 20 ++++---- newlib/libm/test/test_ieee.c | 2 +- newlib/libm/test/test_is.c | 12 ++--- 517 files changed, 1771 insertions(+), 1773 deletions(-) diff --git a/libgloss/cr16/fstat.c b/libgloss/cr16/fstat.c index 637f87d..73e1fa2 100644 --- a/libgloss/cr16/fstat.c +++ b/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 */ diff --git a/libgloss/cr16/isatty.c b/libgloss/cr16/isatty.c index 1cb32e5..604e8f0 100644 --- a/libgloss/cr16/isatty.c +++ b/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), diff --git a/libgloss/cr16/kill.c b/libgloss/cr16/kill.c index b375844..43c3ec5 100644 --- a/libgloss/cr16/kill.c +++ b/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) diff --git a/libgloss/cr16/stat.c b/libgloss/cr16/stat.c index f1769cd..743fc94 100644 --- a/libgloss/cr16/stat.c +++ b/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; diff --git a/libgloss/crx/fstat.c b/libgloss/crx/fstat.c index 380fc2a..75f8635 100644 --- a/libgloss/crx/fstat.c +++ b/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 */ diff --git a/libgloss/crx/isatty.c b/libgloss/crx/isatty.c index 927d754..ac3d041 100644 --- a/libgloss/crx/isatty.c +++ b/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), diff --git a/libgloss/crx/kill.c b/libgloss/crx/kill.c index 3ed228f..db5018c 100644 --- a/libgloss/crx/kill.c +++ b/libgloss/crx/kill.c @@ -20,7 +20,7 @@ */ int _DEFUN (kill, (pid, sig), - int pid _AND + int pid, int sig) { if(pid == __MYPID) diff --git a/libgloss/crx/stat.c b/libgloss/crx/stat.c index 6ffef82..9562b90 100644 --- a/libgloss/crx/stat.c +++ b/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; diff --git a/libgloss/frv/fstat.c b/libgloss/frv/fstat.c index 756f7b2..680c4a1 100644 --- a/libgloss/frv/fstat.c +++ b/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 */ diff --git a/libgloss/frv/isatty.c b/libgloss/frv/isatty.c index b021b4f..e4c9906 100644 --- a/libgloss/frv/isatty.c +++ b/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), diff --git a/libgloss/frv/kill.c b/libgloss/frv/kill.c index 7c365fd..8dda1e9 100644 --- a/libgloss/frv/kill.c +++ b/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) diff --git a/libgloss/frv/sim-time.c b/libgloss/frv/sim-time.c index c4746b4..196f855 100644 --- a/libgloss/frv/sim-time.c +++ b/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; diff --git a/libgloss/frv/stat.c b/libgloss/frv/stat.c index 094ab48..ceaedc2 100644 --- a/libgloss/frv/stat.c +++ b/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; diff --git a/libgloss/fstat.c b/libgloss/fstat.c index 8082d63..e7f9133 100644 --- a/libgloss/fstat.c +++ b/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 */ diff --git a/libgloss/ft32/fstat.c b/libgloss/ft32/fstat.c index 77058b2..0bd432e 100644 --- a/libgloss/ft32/fstat.c +++ b/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 */ diff --git a/libgloss/ft32/isatty.c b/libgloss/ft32/isatty.c index 449410e..fd2d737 100644 --- a/libgloss/ft32/isatty.c +++ b/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), diff --git a/libgloss/ft32/kill.c b/libgloss/ft32/kill.c index 765b03e..4b2241f 100644 --- a/libgloss/ft32/kill.c +++ b/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) diff --git a/libgloss/ft32/sim-lseek.S b/libgloss/ft32/sim-lseek.S index 2dfde16..c2a134c 100644 --- a/libgloss/ft32/sim-lseek.S +++ b/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; diff --git a/libgloss/ft32/sim-lseek.c b/libgloss/ft32/sim-lseek.c index 297de2b..e5c08c8 100644 --- a/libgloss/ft32/sim-lseek.c +++ b/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; */ diff --git a/libgloss/ft32/sim-time.c b/libgloss/ft32/sim-time.c index 25e72a1..8f417eb 100644 --- a/libgloss/ft32/sim-time.c +++ b/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; diff --git a/libgloss/ft32/stat.c b/libgloss/ft32/stat.c index 580e2ca..4d738ef 100644 --- a/libgloss/ft32/stat.c +++ b/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; diff --git a/libgloss/isatty.c b/libgloss/isatty.c index 2d66cd6..675d99b 100644 --- a/libgloss/isatty.c +++ b/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), diff --git a/libgloss/kill.c b/libgloss/kill.c index afc1257..ada45f6 100644 --- a/libgloss/kill.c +++ b/libgloss/kill.c @@ -19,7 +19,7 @@ */ int _DEFUN (kill, (pid, sig), - int pid _AND + int pid, int sig) { if(pid == __MYPID) diff --git a/libgloss/libnosys/chown.c b/libgloss/libnosys/chown.c index 67f98d5..0ddb85d 100644 --- a/libgloss/libnosys/chown.c +++ b/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; diff --git a/libgloss/libnosys/execve.c b/libgloss/libnosys/execve.c index 01743ff..a93641a 100644 --- a/libgloss/libnosys/execve.c +++ b/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; diff --git a/libgloss/libnosys/fstat.c b/libgloss/libnosys/fstat.c index 4e18d42..d04b407 100644 --- a/libgloss/libnosys/fstat.c +++ b/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; diff --git a/libgloss/libnosys/gettod.c b/libgloss/libnosys/gettod.c index 4d42b4b..5e0b2db 100644 --- a/libgloss/libnosys/gettod.c +++ b/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; diff --git a/libgloss/libnosys/kill.c b/libgloss/libnosys/kill.c index f1d12c6..c583287 100644 --- a/libgloss/libnosys/kill.c +++ b/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; diff --git a/libgloss/libnosys/link.c b/libgloss/libnosys/link.c index 35881cf..b27b5bc 100644 --- a/libgloss/libnosys/link.c +++ b/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; diff --git a/libgloss/libnosys/lseek.c b/libgloss/libnosys/lseek.c index 0aa89e2..f583a14 100644 --- a/libgloss/libnosys/lseek.c +++ b/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; diff --git a/libgloss/libnosys/open.c b/libgloss/libnosys/open.c index 2c8a6ce..ee8bece 100644 --- a/libgloss/libnosys/open.c +++ b/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; diff --git a/libgloss/libnosys/read.c b/libgloss/libnosys/read.c index 1a2819c..0ff3a9a 100644 --- a/libgloss/libnosys/read.c +++ b/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; diff --git a/libgloss/libnosys/readlink.c b/libgloss/libnosys/readlink.c index 7df253c..00f3f89 100644 --- a/libgloss/libnosys/readlink.c +++ b/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; diff --git a/libgloss/libnosys/stat.c b/libgloss/libnosys/stat.c index 7c34637..9fa7003 100644 --- a/libgloss/libnosys/stat.c +++ b/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; diff --git a/libgloss/libnosys/symlink.c b/libgloss/libnosys/symlink.c index d9e29f2..cf7a158 100644 --- a/libgloss/libnosys/symlink.c +++ b/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; diff --git a/libgloss/libnosys/write.c b/libgloss/libnosys/write.c index 0136d74..0ada770 100644 --- a/libgloss/libnosys/write.c +++ b/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; diff --git a/libgloss/lseek.c b/libgloss/lseek.c index 1df36f5..42a28d9 100644 --- a/libgloss/lseek.c +++ b/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; diff --git a/libgloss/mcore/fstat.c b/libgloss/mcore/fstat.c index 0205464..6a2323a 100644 --- a/libgloss/mcore/fstat.c +++ b/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 */ diff --git a/libgloss/mcore/kill.c b/libgloss/mcore/kill.c index 43a3597..8883c8e 100644 --- a/libgloss/mcore/kill.c +++ b/libgloss/mcore/kill.c @@ -19,7 +19,7 @@ */ int _DEFUN (_kill, (pid, sig), - int pid _AND + int pid, int sig) { if(pid == __MYPID) diff --git a/libgloss/mcore/lseek.c b/libgloss/mcore/lseek.c index 0f236fe..423e11e 100644 --- a/libgloss/mcore/lseek.c +++ b/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; diff --git a/libgloss/mcore/open.c b/libgloss/mcore/open.c index a9e9959..6b816e8 100644 --- a/libgloss/mcore/open.c +++ b/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; diff --git a/libgloss/mcore/read.c b/libgloss/mcore/read.c index 499426d..8f39478 100644 --- a/libgloss/mcore/read.c +++ b/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; diff --git a/libgloss/mcore/stat.c b/libgloss/mcore/stat.c index 401a6b5..d07042a 100644 --- a/libgloss/mcore/stat.c +++ b/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; diff --git a/libgloss/mcore/write.c b/libgloss/mcore/write.c index 7f39fd1..189ea62 100644 --- a/libgloss/mcore/write.c +++ b/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; diff --git a/libgloss/moxie/fstat.c b/libgloss/moxie/fstat.c index 6464a86..38dd07b 100644 --- a/libgloss/moxie/fstat.c +++ b/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 */ diff --git a/libgloss/moxie/isatty.c b/libgloss/moxie/isatty.c index 14cb9c4..73ade07 100644 --- a/libgloss/moxie/isatty.c +++ b/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), diff --git a/libgloss/moxie/kill.c b/libgloss/moxie/kill.c index 257c491..d602829 100644 --- a/libgloss/moxie/kill.c +++ b/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) diff --git a/libgloss/moxie/qemu-time.c b/libgloss/moxie/qemu-time.c index 4b09209..1abd5a9 100644 --- a/libgloss/moxie/qemu-time.c +++ b/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; diff --git a/libgloss/moxie/sim-lseek.S b/libgloss/moxie/sim-lseek.S index 1c799f8..5e5493c 100644 --- a/libgloss/moxie/sim-lseek.S +++ b/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; diff --git a/libgloss/moxie/sim-lseek.c b/libgloss/moxie/sim-lseek.c index 8e7ee50..d22d722 100644 --- a/libgloss/moxie/sim-lseek.c +++ b/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; */ diff --git a/libgloss/moxie/sim-time.c b/libgloss/moxie/sim-time.c index 3e9fafb..d3f43d3 100644 --- a/libgloss/moxie/sim-time.c +++ b/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; diff --git a/libgloss/moxie/stat.c b/libgloss/moxie/stat.c index 0d7511a..01a9582 100644 --- a/libgloss/moxie/stat.c +++ b/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; diff --git a/libgloss/open.c b/libgloss/open.c index 468b11c..90787b1 100644 --- a/libgloss/open.c +++ b/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; diff --git a/libgloss/read.c b/libgloss/read.c index 419a8ed..2e5e0c7 100644 --- a/libgloss/read.c +++ b/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; diff --git a/libgloss/stat.c b/libgloss/stat.c index ebb7de3..5957645 100644 --- a/libgloss/stat.c +++ b/libgloss/stat.c @@ -21,7 +21,7 @@ */ int _DEFUN (stat, (path, buf), - const char *path _AND + const char *path, struct stat *buf) { errno = EIO; diff --git a/libgloss/tic6x/kill.c b/libgloss/tic6x/kill.c index 3ed228f..db5018c 100644 --- a/libgloss/tic6x/kill.c +++ b/libgloss/tic6x/kill.c @@ -20,7 +20,7 @@ */ int _DEFUN (kill, (pid, sig), - int pid _AND + int pid, int sig) { if(pid == __MYPID) diff --git a/libgloss/write.c b/libgloss/write.c index 292a68e..69f452c 100644 --- a/libgloss/write.c +++ b/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; diff --git a/libgloss/xc16x/misc.c b/libgloss/xc16x/misc.c index 786db36..2eb951a 100644 --- a/libgloss/xc16x/misc.c +++ b/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; diff --git a/libgloss/xstormy16/fstat.c b/libgloss/xstormy16/fstat.c index 982d578..2926cca 100644 --- a/libgloss/xstormy16/fstat.c +++ b/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 */ diff --git a/libgloss/xstormy16/isatty.c b/libgloss/xstormy16/isatty.c index e3c3205..0e92a9f 100644 --- a/libgloss/xstormy16/isatty.c +++ b/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), diff --git a/libgloss/xstormy16/kill.c b/libgloss/xstormy16/kill.c index 0bbc014..2374dc2 100644 --- a/libgloss/xstormy16/kill.c +++ b/libgloss/xstormy16/kill.c @@ -19,7 +19,7 @@ */ int _DEFUN (_kill, (pid, sig), - int pid _AND + int pid, int sig) { if(pid == __MYPID) diff --git a/libgloss/xstormy16/lseek.c b/libgloss/xstormy16/lseek.c index 640a96e..11dbab0 100644 --- a/libgloss/xstormy16/lseek.c +++ b/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; diff --git a/libgloss/xstormy16/open.c b/libgloss/xstormy16/open.c index a2c318e..600f929 100644 --- a/libgloss/xstormy16/open.c +++ b/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; diff --git a/libgloss/xstormy16/stat.c b/libgloss/xstormy16/stat.c index c766a34..b80b83c 100644 --- a/libgloss/xstormy16/stat.c +++ b/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; diff --git a/newlib/libc/argz/argz_add.c b/newlib/libc/argz/argz_add.c index 1c3b170..3194f08 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 7dfbb4d..92c7371 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 c6c3dbe..a84f8e0 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 4761275..33d0eec 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 9d7b2f1..d4b8b05 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 38866e1..afff44c 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 aa94f6d..a4e1227 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 a819f39..4932de6 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 d0a32eca..5965e04 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 94852f5..3f67221 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 b274f91..e6c6ead 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 be5f2cf..72895f5 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 3e91a58..f01d099 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 3d1986b..bbe3852 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 b4f7c28..62d3d0c 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 8a26bc3..9299069 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 1882297..2558656 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 e1c4610..857f849 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; diff --git a/newlib/libc/ctype/iswctype.c b/newlib/libc/ctype/iswctype.c index bfa7b00..89c0f9a 100644 --- a/newlib/libc/ctype/iswctype.c +++ b/newlib/libc/ctype/iswctype.c @@ -38,7 +38,7 @@ No supporting OS subroutines are required. #include "local.h" int -_DEFUN(iswctype,(c, desc), wint_t c _AND wctype_t desc) +_DEFUN(iswctype,(c, desc), wint_t c, wctype_t desc) { switch (desc) { diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c index f5bd7db..8fbd1b0 100644 --- a/newlib/libc/ctype/jp2uc.c +++ b/newlib/libc/ctype/jp2uc.c @@ -48,7 +48,7 @@ #define JP_EUCJP 3 static wint_t -_DEFUN (__jp2uc, (c, type), wint_t c _AND int type) +_DEFUN (__jp2uc, (c, type), wint_t c, int type) { int index, adj; unsigned char byte1, byte2; diff --git a/newlib/libc/ctype/towctrans.c b/newlib/libc/ctype/towctrans.c index 5528542..3500cba 100644 --- a/newlib/libc/ctype/towctrans.c +++ b/newlib/libc/ctype/towctrans.c @@ -77,8 +77,8 @@ No supporting OS subroutines are required. wint_t _DEFUN (_towctrans_r, (r, c, w), - struct _reent *r _AND - wint_t c _AND + struct _reent *r, + wint_t c, wctrans_t w) { if (w == WCT_TOLOWER) @@ -95,7 +95,7 @@ _DEFUN (_towctrans_r, (r, c, w), #ifndef _REENT_ONLY wint_t _DEFUN (towctrans, (c, w), - wint_t c _AND + wint_t c, wctrans_t w) { return _towctrans_r (_REENT, c, w); diff --git a/newlib/libc/ctype/wctrans.c b/newlib/libc/ctype/wctrans.c index dd5b28c..7183c45 100644 --- a/newlib/libc/ctype/wctrans.c +++ b/newlib/libc/ctype/wctrans.c @@ -76,7 +76,7 @@ No supporting OS subroutines are required. wctrans_t _DEFUN (_wctrans_r, (r, c), - struct _reent *r _AND + struct _reent *r, const char *c) { if (!strcmp (c, "tolower")) diff --git a/newlib/libc/ctype/wctype.c b/newlib/libc/ctype/wctype.c index c1a70ee..6cd9425 100644 --- a/newlib/libc/ctype/wctype.c +++ b/newlib/libc/ctype/wctype.c @@ -77,7 +77,7 @@ No supporting OS subroutines are required. wctype_t _DEFUN (_wctype_r, (r, c), - struct _reent *r _AND + struct _reent *r, const char *c) { switch (*c) diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c index 7492697..62bab77 100644 --- a/newlib/libc/iconv/ces/euc.c +++ b/newlib/libc/iconv/ces/euc.c @@ -102,7 +102,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] = #if defined (ICONV_FROM_UCS_CES_EUC) static _VOID_PTR _DEFUN(euc_from_ucs_init, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { int i; @@ -166,7 +166,7 @@ error1: static size_t _DEFUN(euc_from_ucs_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { int i; @@ -186,9 +186,9 @@ _DEFUN(euc_from_ucs_close, (rptr, data), static size_t _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - register ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + register ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { int i; @@ -262,7 +262,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft), #if defined (ICONV_TO_UCS_CES_EUC) static _VOID_PTR _DEFUN(euc_to_ucs_init, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { int i; @@ -326,7 +326,7 @@ error1: static size_t _DEFUN(euc_to_ucs_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { int i; @@ -346,8 +346,8 @@ _DEFUN(euc_to_ucs_close, (rptr, data), static ucs4_t _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { int i; diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c index fc46e27..650bf9a 100644 --- a/newlib/libc/iconv/ces/table-pcs.c +++ b/newlib/libc/iconv/ces/table-pcs.c @@ -41,9 +41,9 @@ #if defined (ICONV_FROM_UCS_CES_TABLE_PCS) static size_t _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { if (*outbytesleft < 1) @@ -66,7 +66,7 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft), static _VOID_PTR _DEFUN(table_pcs_from_ucs_init, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding); @@ -74,7 +74,7 @@ _DEFUN(table_pcs_from_ucs_init, (rptr, encoding), static size_t _DEFUN(table_pcs_from_ucs_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { return _iconv_from_ucs_ces_handlers_table.close (rptr, data); @@ -92,8 +92,8 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data), #if defined (ICONV_TO_UCS_CES_TABLE_PCS) static ucs4_t _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { if (*inbytesleft < 1) @@ -114,7 +114,7 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft), static _VOID_PTR _DEFUN(table_pcs_to_ucs_init, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding); @@ -122,7 +122,7 @@ _DEFUN(table_pcs_to_ucs_init, (rptr, encoding), static size_t _DEFUN(table_pcs_to_ucs_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { return _iconv_to_ucs_ces_handlers_table.close (rptr, data); diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c index e43e23f..39c358c 100644 --- a/newlib/libc/iconv/ces/table.c +++ b/newlib/libc/iconv/ces/table.c @@ -75,7 +75,7 @@ _EXFUN(load_file, (struct _reent *rptr, _CONST char *name, int direction)); */ static size_t _DEFUN(table_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data; @@ -90,7 +90,7 @@ _DEFUN(table_close, (rptr, data), #if defined (ICONV_FROM_UCS_CES_TABLE) static _VOID_PTR _DEFUN(table_init_from_ucs, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { int i; @@ -128,9 +128,9 @@ _DEFUN(table_init_from_ucs, (rptr, encoding), static size_t _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data; @@ -173,7 +173,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft), #if defined (ICONV_TO_UCS_CES_TABLE) static _VOID_PTR _DEFUN(table_init_to_ucs, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { int i; @@ -211,8 +211,8 @@ _DEFUN(table_init_to_ucs, (rptr, encoding), static ucs4_t _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data; @@ -304,7 +304,7 @@ _iconv_from_ucs_ces_handlers_table = */ static __inline ucs2_t _DEFUN(find_code_speed, (code, tblp), - ucs2_t code _AND + ucs2_t code, _CONST __uint16_t *tblp) { int idx = tblp[code >> 8]; @@ -327,7 +327,7 @@ _DEFUN(find_code_speed, (code, tblp), */ static __inline ucs2_t _DEFUN(find_code_speed_8bit, (code, tblp), - ucs2_t code _AND + ucs2_t code, _CONST unsigned char *tblp) { int idx; @@ -367,7 +367,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp), */ static ucs2_t _DEFUN(find_code_size, (code, tblp), - ucs2_t code _AND + ucs2_t code, _CONST __uint16_t *tblp) { int first, last, cur, center; @@ -461,8 +461,8 @@ _DEFUN(find_code_size, (code, tblp), */ static _CONST iconv_ccs_desc_t * _DEFUN(load_file, (rptr, name, direction), - struct _reent *rptr _AND - _CONST char *name _AND + struct _reent *rptr, + _CONST char *name, int direction) { int fd; diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c index 893bdd4..2aacce9 100644 --- a/newlib/libc/iconv/ces/ucs-2-internal.c +++ b/newlib/libc/iconv/ces/ucs-2-internal.c @@ -45,9 +45,9 @@ #if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL) static size_t _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - register ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + register ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { if (in > 0x0000FFFF) @@ -67,8 +67,8 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft), #if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL) static ucs4_t _DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { register ucs4_t res; diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c index 6f796ca..000a791 100644 --- a/newlib/libc/iconv/ces/ucs-2.c +++ b/newlib/libc/iconv/ces/ucs-2.c @@ -51,7 +51,7 @@ static _VOID_PTR _DEFUN(ucs_2_init, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { int *data; @@ -69,7 +69,7 @@ _DEFUN(ucs_2_init, (rptr, encoding), static size_t _DEFUN(ucs_2_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { _free_r (rptr, data); @@ -79,9 +79,9 @@ _DEFUN(ucs_2_close, (rptr, data), #if defined (ICONV_FROM_UCS_CES_UCS_2) static size_t _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { if ((in >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */ @@ -106,8 +106,8 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft), #if defined (ICONV_TO_UCS_CES_UCS_2) static ucs4_t _DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { ucs4_t res; diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c index d8df9b1..4266b2a 100644 --- a/newlib/libc/iconv/ces/ucs-4-internal.c +++ b/newlib/libc/iconv/ces/ucs-4-internal.c @@ -45,9 +45,9 @@ #if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL) static size_t _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - register ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + register ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { if (in > 0x7FFFFFFF) @@ -67,8 +67,8 @@ _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft), #if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL) static ucs4_t _DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { register ucs4_t res; diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c index cfa7b36..1d028c5 100644 --- a/newlib/libc/iconv/ces/ucs-4.c +++ b/newlib/libc/iconv/ces/ucs-4.c @@ -52,7 +52,7 @@ static _VOID_PTR _DEFUN(ucs_4_init, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { int *data; @@ -70,7 +70,7 @@ _DEFUN(ucs_4_init, (rptr, encoding), static size_t _DEFUN(ucs_4_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { _free_r(rptr, data); @@ -81,9 +81,9 @@ _DEFUN(ucs_4_close, (rptr, data), #if defined (ICONV_FROM_UCS_CES_UCS_4) static size_t _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { if ((in >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */ @@ -108,8 +108,8 @@ _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft), #if defined (ICONV_TO_UCS_CES_UCS_4) static ucs4_t _DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { ucs4_t res; diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c index 2f213a7..eb4dee6 100644 --- a/newlib/libc/iconv/ces/us-ascii.c +++ b/newlib/libc/iconv/ces/us-ascii.c @@ -41,9 +41,9 @@ #if defined (ICONV_FROM_UCS_CES_US_ASCII) static size_t _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { if (in > 0x7F) @@ -61,8 +61,8 @@ _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft), #if defined (ICONV_TO_UCS_CES_US_ASCII) static ucs4_t _DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { ucs4_t res; diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c index 4b2ff77..93cc4c3 100644 --- a/newlib/libc/iconv/ces/utf-16.c +++ b/newlib/libc/iconv/ces/utf-16.c @@ -59,7 +59,7 @@ static size_t _DEFUN(utf_16_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { _free_r(rptr, data); @@ -69,7 +69,7 @@ _DEFUN(utf_16_close, (rptr, data), #if defined (ICONV_FROM_UCS_CES_UTF_16) static _VOID_PTR _DEFUN(utf_16_init_from_ucs, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { int *data; @@ -89,9 +89,9 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding), static size_t _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - register ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + register ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { register ucs2_t *cp; @@ -171,7 +171,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft), #if defined (ICONV_TO_UCS_CES_UTF_16) static _VOID_PTR _DEFUN(utf_16_init_to_ucs, (rptr, encoding), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *encoding) { int *data; @@ -191,8 +191,8 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding), static ucs4_t _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { register ucs2_t w1; diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c index fda1e6e..f02dd6f 100644 --- a/newlib/libc/iconv/ces/utf-8.c +++ b/newlib/libc/iconv/ces/utf-8.c @@ -44,9 +44,9 @@ #if defined (ICONV_FROM_UCS_CES_UTF_8) static size_t _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft), - _VOID_PTR data _AND - register ucs4_t in _AND - unsigned char **outbuf _AND + _VOID_PTR data, + register ucs4_t in, + unsigned char **outbuf, size_t *outbytesleft) { register unsigned char *cp; @@ -126,8 +126,8 @@ _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft), #if defined (ICONV_TO_UCS_CES_UTF_8) static ucs4_t _DEFUN(convert_to_ucs, (data, inbuf, inbytesleft), - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND + _VOID_PTR data, + _CONST unsigned char **inbuf, size_t *inbytesleft) { register _CONST unsigned char *in = *inbuf; diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c index 41497c6..278b849 100644 --- a/newlib/libc/iconv/lib/aliasesi.c +++ b/newlib/libc/iconv/lib/aliasesi.c @@ -49,7 +49,7 @@ */ static _CONST char * _DEFUN(canonical_form, (rptr, str), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *str) { char *p, *p1; @@ -94,9 +94,9 @@ _DEFUN(canonical_form, (rptr, str), */ static char * _DEFUN(find_alias, (rptr, alias, table, len), - struct _reent *rptr _AND - _CONST char *alias _AND - _CONST char *table _AND + struct _reent *rptr, + _CONST char *alias, + _CONST char *table, int len) { _CONST char *end; @@ -148,7 +148,7 @@ search_again: */ char * _DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path), - struct _reent *rptr _AND + struct _reent *rptr, _CONST char *ca) { char *p = (char *)ca; diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c index 9d9d6a7..b8000e4 100644 --- a/newlib/libc/iconv/lib/iconv.c +++ b/newlib/libc/iconv/lib/iconv.c @@ -121,7 +121,7 @@ No supporting OS subroutine calls are required. iconv_t _DEFUN(iconv_open, (to, from), - _CONST char *to _AND + _CONST char *to, _CONST char *from) { return _iconv_open_r (_REENT, to, from); @@ -130,10 +130,10 @@ _DEFUN(iconv_open, (to, from), size_t _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft), - iconv_t cd _AND - char **__restrict inbuf _AND - size_t *__restrict inbytesleft _AND - char **__restrict outbuf _AND + iconv_t cd, + char **__restrict inbuf, + size_t *__restrict inbytesleft, + char **__restrict outbuf, size_t *__restrict outbytesleft) { return _iconv_r (_REENT, cd, (_CONST char **) inbuf, inbytesleft, @@ -151,8 +151,8 @@ _DEFUN(iconv_close, (cd), iconv_t cd) #ifndef _REENT_ONLY iconv_t _DEFUN(_iconv_open_r, (rptr, to, from), - struct _reent *rptr _AND - _CONST char *to _AND + struct _reent *rptr, + _CONST char *to, _CONST char *from) { iconv_conversion_t *ic; @@ -202,11 +202,11 @@ _DEFUN(_iconv_open_r, (rptr, to, from), size_t _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft), - struct _reent *rptr _AND - iconv_t cd _AND - _CONST char **inbuf _AND - size_t *inbytesleft _AND - char **outbuf _AND + struct _reent *rptr, + iconv_t cd, + _CONST char **inbuf, + size_t *inbytesleft, + char **outbuf, size_t *outbytesleft) { iconv_conversion_t *ic = (iconv_conversion_t *)cd; @@ -289,7 +289,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft), int _DEFUN(_iconv_close_r, (rptr, cd), - struct _reent *rptr _AND + struct _reent *rptr, iconv_t cd) { int res; diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c index 1b42f2c..3223e13 100644 --- a/newlib/libc/iconv/lib/iconvnls.c +++ b/newlib/libc/iconv/lib/iconvnls.c @@ -60,9 +60,9 @@ */ _CONST char * _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext), - struct _reent *rptr _AND - _CONST char *file _AND - _CONST char *dir _AND + struct _reent *rptr, + _CONST char *file, + _CONST char *dir, _CONST char *ext) { int len1, len2, len3; @@ -115,7 +115,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext), */ int _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction), - iconv_t cd _AND + iconv_t cd, int direction) { iconv_conversion_t *ic = (iconv_conversion_t *)cd; @@ -138,7 +138,7 @@ _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction), */ int _DEFUN(_iconv_nls_is_stateful, (cd, direction), - iconv_t cd _AND + iconv_t cd, int direction) { iconv_conversion_t *ic = (iconv_conversion_t *)cd; @@ -167,11 +167,11 @@ _DEFUN(_iconv_nls_is_stateful, (cd, direction), */ size_t _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft), - struct _reent *rptr _AND - iconv_t cd _AND - _CONST char **inbuf _AND - size_t *inbytesleft _AND - char **outbuf _AND + struct _reent *rptr, + iconv_t cd, + _CONST char **inbuf, + size_t *inbytesleft, + char **outbuf, size_t *outbytesleft) { iconv_conversion_t *ic = (iconv_conversion_t *)cd; @@ -221,8 +221,8 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft), */ _VOID _DEFUN(_iconv_nls_get_state, (cd, ps, direction), - iconv_t cd _AND - mbstate_t *ps _AND + iconv_t cd, + mbstate_t *ps, int direction) { iconv_conversion_t *ic = (iconv_conversion_t *)cd; @@ -248,8 +248,8 @@ _DEFUN(_iconv_nls_get_state, (cd, ps, direction), */ int _DEFUN(_iconv_nls_set_state, (cd, ps, direction), - iconv_t cd _AND - mbstate_t *ps _AND + iconv_t cd, + mbstate_t *ps, int direction) { iconv_conversion_t *ic = (iconv_conversion_t *)cd; @@ -260,8 +260,8 @@ _DEFUN(_iconv_nls_set_state, (cd, ps, direction), /* Same as iconv_open() but don't perform name resolving */ static iconv_t _DEFUN(iconv_open1, (rptr, to, from), - struct _reent *rptr _AND - _CONST char *to _AND + struct _reent *rptr, + _CONST char *to, _CONST char *from) { iconv_conversion_t *ic; @@ -317,10 +317,10 @@ _DEFUN(iconv_open1, (rptr, to, from), */ int _DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb), - struct _reent *rptr _AND - _CONST char *encoding _AND - iconv_t *tomb _AND - iconv_t *towc _AND + struct _reent *rptr, + _CONST char *encoding, + iconv_t *tomb, + iconv_t *towc, int flag) { _CONST char *wchar_encoding; diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c index d35027f..7ddbc77 100644 --- a/newlib/libc/iconv/lib/nullconv.c +++ b/newlib/libc/iconv/lib/nullconv.c @@ -37,8 +37,8 @@ static int null_conversion_dummy_data; static _VOID_PTR _DEFUN(null_conversion_open, (rptr, to, from), - struct _reent *rptr _AND - _CONST char *to _AND + struct _reent *rptr, + _CONST char *to, _CONST char *from) { return (_VOID_PTR)&null_conversion_dummy_data; @@ -47,7 +47,7 @@ _DEFUN(null_conversion_open, (rptr, to, from), static size_t _DEFUN(null_conversion_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { return 0; @@ -57,12 +57,12 @@ _DEFUN(null_conversion_close, (rptr, data), static size_t _DEFUN(null_conversion_convert, (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft), - struct _reent *rptr _AND - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND - size_t *inbytesleft _AND - unsigned char **outbuf _AND - size_t *outbytesleft _AND + struct _reent *rptr, + _VOID_PTR data, + _CONST unsigned char **inbuf, + size_t *inbytesleft, + unsigned char **outbuf, + size_t *outbytesleft, int flags) { size_t result; @@ -94,7 +94,7 @@ _DEFUN(null_conversion_convert, static int _DEFUN(null_conversion_get_mb_cur_max, (data, direction), - _VOID_PTR data _AND + _VOID_PTR data, int direction) { return ICONV_MB_LEN_MAX; @@ -103,8 +103,8 @@ _DEFUN(null_conversion_get_mb_cur_max, (data, direction), static _VOID _DEFUN(null_conversion_get_state, (data, state, size), - _VOID_PTR data _AND - mbstate_t *state _AND + _VOID_PTR data, + mbstate_t *state, int direction) { return; @@ -113,8 +113,8 @@ _DEFUN(null_conversion_get_state, (data, state, size), static int _DEFUN(null_conversion_set_state, (data, state, direction), - _VOID_PTR data _AND - mbstate_t *state _AND + _VOID_PTR data, + mbstate_t *state, int direction) { return 0; @@ -122,7 +122,7 @@ _DEFUN(null_conversion_set_state, (data, state, direction), static int _DEFUN(null_conversion_is_stateful, (data, direction), - _VOID_PTR data _AND + _VOID_PTR data, int direction) { return 0; diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c index cc5ceb9..46ad33e 100644 --- a/newlib/libc/iconv/lib/ucsconv.c +++ b/newlib/libc/iconv/lib/ucsconv.c @@ -46,8 +46,8 @@ _EXFUN(find_encoding_name, (_CONST char *searchee, static _VOID_PTR _DEFUN(ucs_based_conversion_open, (rptr, to, from), - struct _reent *rptr _AND - _CONST char *to _AND + struct _reent *rptr, + _CONST char *to, _CONST char *from) { iconv_ucs_conversion_t *uc; @@ -124,7 +124,7 @@ error: static size_t _DEFUN(ucs_based_conversion_close, (rptr, data), - struct _reent *rptr _AND + struct _reent *rptr, _VOID_PTR data) { iconv_ucs_conversion_t *uc; @@ -146,12 +146,12 @@ _DEFUN(ucs_based_conversion_close, (rptr, data), static size_t _DEFUN(ucs_based_conversion_convert, (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags), - struct _reent *rptr _AND - _VOID_PTR data _AND - _CONST unsigned char **inbuf _AND - size_t *inbytesleft _AND - unsigned char **outbuf _AND - size_t *outbytesleft _AND + struct _reent *rptr, + _VOID_PTR data, + _CONST unsigned char **inbuf, + size_t *inbytesleft, + unsigned char **outbuf, + size_t *outbytesleft, int flags) { unsigned char outbuf1[ICONV_MB_LEN_MAX]; @@ -239,7 +239,7 @@ _DEFUN(ucs_based_conversion_convert, static int _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction), - _VOID_PTR data _AND + _VOID_PTR data, int direction) { iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data; @@ -253,8 +253,8 @@ _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction), static _VOID _DEFUN(ucs_based_conversion_get_state, (data, state, direction), - _VOID_PTR data _AND - mbstate_t *state _AND + _VOID_PTR data, + mbstate_t *state, int direction) { iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data; @@ -281,8 +281,8 @@ _DEFUN(ucs_based_conversion_get_state, (data, state, direction), static int _DEFUN(ucs_based_conversion_set_state, (data, state, direction), - _VOID_PTR data _AND - mbstate_t *state _AND + _VOID_PTR data, + mbstate_t *state, int direction) { iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data; @@ -303,7 +303,7 @@ _DEFUN(ucs_based_conversion_set_state, (data, state, direction), static int _DEFUN(ucs_based_conversion_is_stateful, (data, direction), - _VOID_PTR data _AND + _VOID_PTR data, int direction) { iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data; @@ -343,7 +343,7 @@ _iconv_ucs_conversion_handlers = static int _DEFUN(find_encoding_name, (searchee, names), - _CONST char *searchee _AND + _CONST char *searchee, _CONST char **names) { _CONST char *p; diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h index 5fb9907..fc832fc 100644 --- a/newlib/libc/include/_ansi.h +++ b/newlib/libc/include/_ansi.h @@ -48,7 +48,6 @@ #ifdef _HAVE_STDC #define _PTR void * -#define _AND , #define _NOARGS void #define _CONST const #define _VOLATILE volatile @@ -77,7 +76,6 @@ #endif #else #define _PTR char * -#define _AND ; #define _NOARGS #define _CONST #define _VOLATILE diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c index 073189a..87cb04b 100644 --- a/newlib/libc/locale/locale.c +++ b/newlib/libc/locale/locale.c @@ -290,8 +290,8 @@ static char *currentlocale (void); char * _DEFUN(_setlocale_r, (p, category, locale), - struct _reent *p _AND - int category _AND + struct _reent *p, + int category, _CONST char *locale) { #ifndef _MB_CAPABLE @@ -991,7 +991,7 @@ __locale_ctype_ptr (void) char * _DEFUN (setlocale, (category, locale), - int category _AND + int category, _CONST char *locale) { return _setlocale_r (_REENT, category, locale); diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c index fc7dc21..a2751af 100644 --- a/newlib/libc/machine/microblaze/strcmp.c +++ b/newlib/libc/machine/microblaze/strcmp.c @@ -82,7 +82,7 @@ QUICKREF int _DEFUN (strcmp, (s1, s2), - _CONST char *s1 _AND + _CONST char *s1, _CONST char *s2) { diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c index 44ba382..e0e1d77 100644 --- a/newlib/libc/machine/microblaze/strcpy.c +++ b/newlib/libc/machine/microblaze/strcpy.c @@ -82,7 +82,7 @@ QUICKREF char* _DEFUN (strcpy, (dst0, src0), - char *__restrict dst0 _AND + char *__restrict dst0, _CONST char *__restrict src0) { diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c index 30379c5..5115c85 100644 --- a/newlib/libc/machine/powerpc/atosfix16.c +++ b/newlib/libc/machine/powerpc/atosfix16.c @@ -63,7 +63,7 @@ PORTABILITY __int16_t _DEFUN (_atosfix16_r, (reent, s), - struct _reent *reent _AND + struct _reent *reent, _CONST char *s) { return _strtosfix16_r (reent, s, NULL); diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c index dbcac7e..49f4cce 100644 --- a/newlib/libc/machine/powerpc/atosfix32.c +++ b/newlib/libc/machine/powerpc/atosfix32.c @@ -9,7 +9,7 @@ __int32_t _DEFUN (_atosfix32_r, (reent, s), - struct _reent *reent _AND + struct _reent *reent, _CONST char *s) { return _strtosfix32_r (reent, s, NULL); diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c index 109baf7..b433778 100644 --- a/newlib/libc/machine/powerpc/atosfix64.c +++ b/newlib/libc/machine/powerpc/atosfix64.c @@ -9,7 +9,7 @@ __int64_t _DEFUN (_atosfix64_r, (reent, s), - struct _reent *reent _AND + struct _reent *reent, _CONST char *s) { return _strtosfix64_r (reent, s, NULL); diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c index 45d130f..5148acb 100644 --- a/newlib/libc/machine/powerpc/atoufix16.c +++ b/newlib/libc/machine/powerpc/atoufix16.c @@ -63,7 +63,7 @@ PORTABILITY __uint16_t _DEFUN (_atoufix16_r, (reent, s), - struct _reent *reent _AND + struct _reent *reent, _CONST char *s) { return _strtoufix16_r (reent, s, NULL); diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c index ee29ac5..01919d4 100644 --- a/newlib/libc/machine/powerpc/atoufix32.c +++ b/newlib/libc/machine/powerpc/atoufix32.c @@ -9,7 +9,7 @@ __uint32_t _DEFUN (_atoufix32_r, (reent, s), - struct _reent *reent _AND + struct _reent *reent, _CONST char *s) { return _strtoufix32_r (reent, s, NULL); diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c index e5eefc4..af71089 100644 --- a/newlib/libc/machine/powerpc/atoufix64.c +++ b/newlib/libc/machine/powerpc/atoufix64.c @@ -9,7 +9,7 @@ __uint64_t _DEFUN (_atoufix64_r, (reent, s), - struct _reent *reent _AND + struct _reent *reent, _CONST char *s) { return _strtoufix64_r (reent, s, NULL); diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c index e39887d..84e1171 100644 --- a/newlib/libc/machine/powerpc/strtosfix16.c +++ b/newlib/libc/machine/powerpc/strtosfix16.c @@ -93,8 +93,8 @@ PORTABILITY */ __int16_t _DEFUN (_strtosfix16_r, (rptr, nptr, endptr), - struct _reent *rptr _AND - _CONST char *nptr _AND + struct _reent *rptr, + _CONST char *nptr, char **endptr) { union double_union dbl; @@ -170,7 +170,7 @@ _DEFUN (_strtosfix16_r, (rptr, nptr, endptr), __int16_t _DEFUN (strtosfix16, (s, ptr, base), - _CONST char *s _AND + _CONST char *s, char **ptr) { return _strtosfix16_r (_REENT, s, ptr); diff --git a/newlib/libc/machine/powerpc/strtosfix32.c b/newlib/libc/machine/powerpc/strtosfix32.c index 2e22c14..1b1487b 100644 --- a/newlib/libc/machine/powerpc/strtosfix32.c +++ b/newlib/libc/machine/powerpc/strtosfix32.c @@ -14,8 +14,8 @@ */ __int32_t _DEFUN (_strtosfix32_r, (rptr, nptr, endptr), - struct _reent *rptr _AND - _CONST char *nptr _AND + struct _reent *rptr, + _CONST char *nptr, char **endptr) { union double_union dbl; @@ -93,7 +93,7 @@ _DEFUN (_strtosfix32_r, (rptr, nptr, endptr), __int32_t _DEFUN (strtosfix32, (s, ptr, base), - _CONST char *s _AND + _CONST char *s, char **ptr) { return _strtosfix32_r (_REENT, s, ptr); diff --git a/newlib/libc/machine/powerpc/strtosfix64.c b/newlib/libc/machine/powerpc/strtosfix64.c index 3006632..4ba718c 100644 --- a/newlib/libc/machine/powerpc/strtosfix64.c +++ b/newlib/libc/machine/powerpc/strtosfix64.c @@ -14,8 +14,8 @@ */ __int64_t _DEFUN (_strtosfix64_r, (rptr, nptr, endptr), - struct _reent *rptr _AND - _CONST char *nptr _AND + struct _reent *rptr, + _CONST char *nptr, char **endptr) { union long_double_union ldbl; @@ -106,7 +106,7 @@ _DEFUN (_strtosfix64_r, (rptr, nptr, endptr), __int64_t _DEFUN (strtosfix64, (s, ptr, base), - _CONST char *s _AND + _CONST char *s, char **ptr) { return _strtosfix64_r (_REENT, s, ptr); diff --git a/newlib/libc/machine/powerpc/strtoufix16.c b/newlib/libc/machine/powerpc/strtoufix16.c index 3bf2d6b..22de506 100644 --- a/newlib/libc/machine/powerpc/strtoufix16.c +++ b/newlib/libc/machine/powerpc/strtoufix16.c @@ -92,8 +92,8 @@ PORTABILITY */ __uint16_t _DEFUN (_strtoufix16_r, (rptr, nptr, endptr), - struct _reent *rptr _AND - _[...] [diff truncated at 100000 bytes]