(split) Apply minor changes from v3.32 to v3.35 in the upstream.

[linuxjm/LDP_man-pages.git] / draft / man3 / mbrtowc.3

diff --git a/draft/man3/mbrtowc.3 b/draft/man3/mbrtowc.3
index a482876..3d2953c 100644 (file)
--- a/draft/man3/mbrtowc.3
+++ b/draft/man3/mbrtowc.3
@@ -18,7 +18,7 @@
 .\"         by HANATAKA Shinya <hanataka@abyss.rim.or.jp>
 .\" Updated Thu Dec 13 JST 2001 by Kentaro Shirakata <argrath@ub32.org>
 .\"
-.TH MBRTOWC 3  2001-11-22 "GNU" "Linux Programmer's Manual"
+.TH MBRTOWC 3  2011-09-28 "GNU" "Linux Programmer's Manual"
 .\"O .SH NAME
 .SH ̾Á°
 .\"O mbrtowc \- convert a multibyte sequence to a wide character
@@ -43,7 +43,9 @@ mbrtowc \- 
 .\"O \fI*pwc\fP.
 .\"O It updates the shift state \fI*ps\fP.
 .\"O If the converted wide
-.\"O character is not L\(aq\\0\(aq, it returns the number of bytes that were consumed
+.\"O- character is not L\(aq\\0\(aq, it returns the number of bytes that were consumed
+.\"O+ character is not L\(aq\\0\(aq (the null wide character),
+.\"O+ it returns the number of bytes that were consumed
 .\"O from \fIs\fP.
 .\"O If the converted wide character is L\(aq\\0\(aq, it resets the shift
 .\"O state \fI*ps\fP to the initial state and returns 0.
@@ -53,8 +55,9 @@ mbrtowc \- 
 ´Ø¿ô¤Ï \fIs\fP ¤«¤é»Ï¤Þ¤ëºÇÂç \fIn\fP ¥Ð¥¤¥È¤Î
 ¥Þ¥ë¥Á¥Ð¥¤¥Èʸ»ú¤ò¸¡ºº¤·¤Æ¡¢¼¡¤Î´°Á´¤Ê¥Þ¥ë¥Á¥Ð¥¤¥Èʸ»úÎó¤ò¼è¤ê½Ð¤·¡¢
 ¤½¤ì¤ò¥ï¥¤¥Éʸ»ú¤ËÊÑ´¹¤·¤Æ \fI*pwc\fP ¤Ë³ÊǼ¤¹¤ë¡£
-Ʊ»þ¤Ë¥·¥Õ¥È¾õÂÖ \fI*ps\fP ¤ò¹¹¿·¤¹¤ë¡£ÊÑ´¹¤·¤¿¥ï¥¤¥Éʸ»ú¤¬ L\(aq\\0\(aq ¤Ç
-¤Ê¤±¤ì¤Ð¡¢\fIs\fP ¤«¤é¾ÃÈñ¤¹¤ë¥Ð¥¤¥È¿ô¤òÊÖ¤¹¡£
+Ʊ»þ¤Ë¥·¥Õ¥È¾õÂÖ \fI*ps\fP ¤ò¹¹¿·¤¹¤ë¡£
+ÊÑ´¹¤·¤¿¥ï¥¤¥Éʸ»ú¤¬ L\(aq\\0\(aq (NULL ¥ï¥¤¥Éʸ»ú) ¤Ç¤Ê¤±¤ì¤Ð¡¢
+\fIs\fP ¤«¤é¾ÃÈñ¤¹¤ë¥Ð¥¤¥È¿ô¤òÊÖ¤¹¡£
 ÊÑ´¹¤·¤¿¥ï¥¤¥Éʸ»ú¤¬ L\(aq\\0\(aq ¤Î¾ì¹ç¤Ë¤Ï¥·¥Õ¥È¾õÂÖ \fI*ps\fP ¤ò
 ½é´ü¾õÂÖ¤ËÌᤷ¤Æ 0 ¤òÊÖ¤¹¡£
 .PP