Update.

[platform/upstream/glibc.git] / stdio-common / printf-prs.c

diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c
index d0756de..ecbb47d 100644 (file)
--- a/stdio-common/printf-prs.c
+++ b/stdio-common/printf-prs.c
@@ -1,26 +1,29 @@
-/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991,92,95,96,99,2000,2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include <stdio.h>
 #include <printf.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
+#include <sys/param.h>
+
+#include "../locale/localeinfo.h"
 
 #ifndef COMPILE_WPRINTF
 # define CHAR_T                char
@@ -28,12 +31,14 @@ Cambridge, MA 02139, USA.  */
 # define INT_T         int
 # define L_(Str)       Str
 # define ISDIGIT(Ch)   isdigit (Ch)
+# define ISASCII(Ch)   isascii (Ch)
+# define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St)
 
 # ifdef USE_IN_LIBIO
 #  define PUT(F, S, N) _IO_sputn (F, S, N)
 #  define PAD(Padchar)                                                       \
   if (width > 0)                                                             \
-    done += _IO_padn (s, Padchar, width)
+    done += INTUSE(_IO_padn) (s, Padchar, width)
 # else
 #  define PUTC(C, F)   putc (C, F)
 ssize_t __printf_pad __P ((FILE *, char pad, size_t n));
@@ -81,7 +86,6 @@ parse_printf_format (fmt, n, argtypes)
 
   nargs = 0;
   max_ref_arg = 0;
-  mbstate = 0;
 
   /* Search for format specifications.  */
   for (fmt = find_spec (fmt, &mbstate); *fmt != '\0'; fmt = spec.next_fmt)
@@ -90,14 +94,14 @@ parse_printf_format (fmt, n, argtypes)
       nargs += parse_one_spec (fmt, nargs, &spec, &max_ref_arg, &mbstate);
 
       /* If the width is determined by an argument this is an int.  */
-      if (spec.width_arg != -1 && spec.width_arg < n)
+      if (spec.width_arg != -1 && (size_t) spec.width_arg < n)
        argtypes[spec.width_arg] = PA_INT;
 
       /* If the precision is determined by an argument this is an int.  */
-      if (spec.prec_arg != -1 && spec.prec_arg < n)
+      if (spec.prec_arg != -1 && (size_t) spec.prec_arg < n)
        argtypes[spec.prec_arg] = PA_INT;
 
-      if (spec.data_arg < n)
+      if ((size_t) spec.data_arg < n)
        switch (spec.ndata_args)
          {
          case 0:               /* No arguments.  */