Libc-763.11.tar.gz

[apple/libc.git] / locale / FreeBSD / mbtowc.3.patch

diff --git a/locale/FreeBSD/mbtowc.3.patch b/locale/FreeBSD/mbtowc.3.patch
index 48538b16f4dbc73fbe3432073363307b3a0ec74b..8bfdf8638341ce013f09d63006e43a3eb1dbba1b 100644 (file)
--- a/locale/FreeBSD/mbtowc.3.patch
+++ b/locale/FreeBSD/mbtowc.3.patch
@@ -1,6 +1,6 @@
---- mbtowc.3.orig      Fri Mar 11 19:44:47 2005
-+++ mbtowc.3   Fri Mar 11 19:54:09 2005
-@@ -41,7 +41,8 @@
+--- mbtowc.3.orig      2009-11-09 15:05:25.000000000 -0800
++++ mbtowc.3   2009-11-09 15:05:26.000000000 -0800
+@@ -37,7 +37,8 @@
  .Dt MBTOWC 3
  .Os
  .Sh NAME
@@ -10,20 +10,45 @@
  .Nd convert a character to a wide-character code
  .Sh LIBRARY
  .Lb libc
-@@ -52,6 +53,12 @@
- .Fa "wchar_t * restrict wcharp" "const char * restrict mbchar"
- .Fa "size_t nbytes"
- .Fc
+@@ -45,30 +46,48 @@
+ .In stdlib.h
+ .Ft int
+ .Fo mbtowc
+-.Fa "wchar_t * restrict wcharp" "const char * restrict mbchar"
+-.Fa "size_t nbytes"
++.Fa "wchar_t *restrict pwc"
++.Fa "const char *restrict s"
++.Fa "size_t n"
++.Fc
++.In stdlib.h
 +.In xlocale.h
 +.Ft int
 +.Fo mbtowc_l
-+.Fa "wchar_t * restrict wcharp" "const char * restrict mbchar"
-+.Fa "size_t nbytes" "locale_t loc"
-+.Fc
++.Fa "wchar_t *restrict pwc"
++.Fa "const char *restrict s"
++.Fa "size_t n"
++.Fa "locale_t loc"
+ .Fc
  .Sh DESCRIPTION
  The
  .Fn mbtowc
-@@ -70,6 +77,14 @@
+ function converts a multibyte character
+-.Fa mbchar
+-into a wide character according to the current conversion state,
++.Fa s
++into a wide character, according to the current conversion state,
+ and stores the result
+ in the object pointed to by
+-.Fa wcharp .
++.Fa pwc .
+ Up to
+-.Fa nbytes
++.Fa n
+ bytes are examined.
+ .Pp
+ A call with a null
+-.Fa mbchar
++.Fa s
  pointer returns nonzero if the current encoding requires shift states,
  zero otherwise;
  if shift states are required, the shift state is reset to the initial state.
@@ -37,8 +62,30 @@
 +for more information.
  .Sh RETURN VALUES
  If
- .Fa mbchar
-@@ -110,7 +125,8 @@
+-.Fa mbchar
++.Fa s
+ is
+ .Dv NULL ,
+ the
+@@ -77,14 +96,14 @@ function returns nonzero if shift states
+ zero otherwise.
+ .Pp
+ Otherwise, if
+-.Fa mbchar
++.Fa s
+ is not a null pointer,
+ .Fn mbtowc
+ either returns 0 if
+-.Fa mbchar
++.Fa s
+ represents the null wide character, or returns
+ the number of bytes processed in
+-.Fa mbchar ,
++.Fa s ,
+ or returns \-1 if no multibyte character
+ could be recognized or converted.
+ In this case,
+@@ -106,7 +125,8 @@ The internal conversion state is invalid
  .Xr mbrtowc 3 ,
  .Xr mbstowcs 3 ,
  .Xr multibyte 3 ,