StdLib: Add multi-byte character support. The normal "narrow" character set is now...

[mirror_edk2.git] / StdLib / Include / stdio.h

diff --git a/StdLib/Include/stdio.h b/StdLib/Include/stdio.h
index 7f3204bf74924648b19b42589cbf01952cb378e6..c0a4deb7837eaeca1ab64edd8d7d8975fe28dad6 100644 (file)
--- a/StdLib/Include/stdio.h
+++ b/StdLib/Include/stdio.h
@@ -105,7 +105,7 @@
           by a three-character attempt at a mnemonic.\r
 \r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials are licensed and made available under\r
   the terms and conditions of the BSD License that accompanies this distribution.\r
   The full text of the license may be found at\r
@@ -243,8 +243,8 @@ typedef struct __sFILE {
   /*@}*/\r
 \r
   /* tricks to meet minimum requirements even when malloc() fails */\r
-  unsigned char   _ubuf[3];   /**< guarantee an ungetc() buffer */\r
-  unsigned char   _nbuf[1];   /**< guarantee a getc() buffer */\r
+  unsigned char   _ubuf[3 * MB_LEN_MAX];   /**< guarantee an ungetc() buffer */\r
+  unsigned char   _nbuf[1 * MB_LEN_MAX];   /**< guarantee a getc() buffer */\r
 \r
   /** separate buffer for fgetln() when line crosses buffer boundary */\r
   struct  __sbuf  _lb;        /* buffer for fgetln() */\r
@@ -715,8 +715,7 @@ int       setvbuf (FILE * __restrict fp, char * __restrict Buff, int BufMode, si
     @param[in]  stream    An open File specifier to which the output is sent.\r
     @param[in]  format    A multi-byte character sequence containing characters\r
                           to be copied unchanged, and conversion specifiers\r
-                          which convert their associated arguments.  Copied and\r
-                          converted characters are sent to the output stream.\r
+                          which convert their associated arguments.\r
     @param      ...       Variable number of parameters as required by format.\r
 \r
     @return     The fprintf function returns the number of characters\r
@@ -1292,10 +1291,10 @@ size_t    fread   (void   * __restrict  Buffer,
               encountered.  If Size or Num is zero, fwrite returns zero and\r
               the state of the stream remains unchanged.\r
 **/\r
-size_t    fwrite  (void   * __restrict  Buffer,\r
-                   size_t               Size,\r
-                   size_t               Num,\r
-                   FILE   * __restrict  Stream\r
+size_t    fwrite  (const void   * __restrict  Buffer,\r
+                   size_t                     Size,\r
+                   size_t                     Num,\r
+                   FILE         * __restrict  Stream\r
                   );\r
 \r
 /* ################ File Positioning Functions.  */\r
@@ -1497,7 +1496,7 @@ __BEGIN_DECLS
   int   mkstemp(char *);\r
   char *mktemp(char *);\r
 \r
-    char *tempnam(const char *, const char *);\r
+  char *tempnam(const char *, const char *);\r
 __END_DECLS\r
 \r
 /*\r
@@ -1510,7 +1509,7 @@ __END_DECLS
 \r
 __BEGIN_DECLS\r
 int     fseeko(FILE *, off_t, int);\r
-//off_t   ftello(FILE *);\r
+off_t   ftello(FILE *);\r
 __END_DECLS\r
 \r
 /*\r