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

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

diff --git a/draft/man3/scanf.3 b/draft/man3/scanf.3
index ac211a1..d596487 100644 (file)
--- a/draft/man3/scanf.3
+++ b/draft/man3/scanf.3
@@ -57,7 +57,7 @@
 .\"WORD:       conversion specifications       ÊÑ´¹»ØÄê
 .\"WORD:       type modifier                   ·¿½¤¾þ»Ò
 .\"
-.TH SCANF 3  2010-09-20 "GNU" "Linux Programmer's Manual"
+.TH SCANF 3  2011-09-28 "GNU" "Linux Programmer's Manual"
 .\"O .SH NAME
 .SH ̾Á°
 .\"O scanf, fscanf, sscanf, vscanf, vsscanf, vfscanf \- input format conversion
@@ -266,7 +266,7 @@ or
 .\"O .I pointer
 .\"O argument.
 .\"O If the next item of input does not match the conversion specification,
-.\"O the conversion fails \(em this is a
+.\"O the conversion fails\(emthis is a
 .\"O .IR "matching failure" .
 ÊÑ´¹»ØÄê¡£ÊÑ´¹»ØÄê¤Ï \(aq%\(aq (¥Ñ¡¼¥»¥ó¥È) ʸ»ú¤Ç»Ï¤Þ¤ë¡£
 ÆþÎϤµ¤ì¤¿Ê¸»ú¤Î·ÏÎó¤Ï¤³¤Î»ØÄê¤Ë¤â¤È¤Å¤¤¤ÆÊÑ´¹¤µ¤ì¡¢
@@ -274,7 +274,7 @@ or
 .I pointer
 °ú¤­¿ô¤¬»Ø¤¹¾ì½ê¤Ë³ÊǼ¤µ¤ì¤ë¡£
 ÆþÎϤμ¡¤Îʸ»ú¤¬ÊÑ´¹»ØÄê¤È°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢ÊÑ´¹¤Ï¼ºÇÔ¤¹¤ë
-\(em ¤³¤ì¤¬
+\(em¤³¤ì¤¬
 .I "¡Ö°ìÃפμºÇÔ¡× (matching failure)"
 ¤Ç¤¢¤ë¡£
 .PP
@@ -354,7 +354,7 @@ C99 
 .\"O Most conversions discard initial white space characters (the exceptions
 .\"O are noted below),
 .\"O and these discarded characters don't count toward the maximum field width.
-.\"O String input conversions store a null terminator (\(aq\\0\(aq)
+.\"O String input conversions store a terminating null byte (\(aq\\0\(aq)
 .\"O to mark the end of the input;
 .\"O the maximum field width does not include this terminator.
 .I "¡ÖºÇÂç¥Õ¥£¡¼¥ë¥ÉÉý¡×"
@@ -364,8 +364,8 @@ C99 
 ¤Û¤È¤ó¤É¤ÎÊÑ´¹¤Ç¤Ï¡¢ÀèƬ¤Î¥Û¥ï¥¤¥È¥¹¥Ú¡¼¥¹Ê¸»ú¤Ï¼Î¤Æ¤é¤ì
 (Îã³°¤Ë¤Ä¤¤¤Æ¤Ï¸å½Ò¤¹¤ë)¡¢
 ¼Î¤Æ¤é¤ì¤¿¤³¤ì¤é¤Îʸ»ú¤ÏºÇÂç¥Õ¥£¡¼¥ë¥ÉÉý¤Î·×»»¤Ë¤Ï´Þ¤Þ¤ì¤Ê¤¤¡£
-ʸ»úÎó¤ÎÆþÎÏÊÑ´¹¤Ç¤Ï¡¢ÆþÎϤÎËöÈø¤ò¼¨¤¹¥Ì¥ë½ªÃ¼Ê¸»ú (\(aq\\0\(aq)
-¤â³ÊǼ¤µ¤ì¤ë¤¬¡¢ºÇÂç¥Õ¥£¡¼¥ë¥ÉÉý¤Ë¤Ï¤³¤Î½ªÃ¼Ê¸»ú¤Ï´Þ¤Þ¤ì¤Ê¤¤¡£
+ʸ»úÎó¤ÎÆþÎÏÊÑ´¹¤Ç¤Ï¡¢ÆþÎϤÎËöÈø¤ò¼¨¤¹½ªÃ¼¤Î NULL ¥Ð¥¤¥È (\(aq\\0\(aq)
+¤â³ÊǼ¤µ¤ì¤ë¤¬¡¢ºÇÂç¥Õ¥£¡¼¥ë¥ÉÉý¤Ë¤Ï¤³¤Î½ªÃ¼¥Ð¥¤¥È¤Ï´Þ¤Þ¤ì¤Ê¤¤¡£
 .TP
 \(bu
 .\"O An optional
@@ -770,14 +770,14 @@ C99 
 .B s
 .\"O Matches a sequence of non-white-space characters;
 .\"O the next pointer must be a pointer to character array that is
-.\"O long enough to hold the input sequence and the terminating null
-.\"O character (\(aq\\0\(aq), which is added automatically.
+.\"O long enough to hold the input sequence and
+.\"O the terminating null byte (\(aq\\0\(aq), which is added automatically.
 .\"O The input string stops at white space or at the maximum field
 .\"O width, whichever occurs first.
 ¥Û¥ï¥¤¥È¥¹¥Ú¡¼¥¹¤Ç¤Ï¤Ê¤¤Ê¸»ú¤Ç¹½À®¤µ¤ì¤¿Ê¸»úÎó¤ËÂбþ¤¹¤ë¡£
 ¼¡¤Î¥Ý¥¤¥ó¥¿¤Ïʸ»ú¤ÎÇÛÎó¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤º¡¢
-¤½¤Îʸ»úÇÛÎó¤Ï¡¢ÆþÎϤµ¤ì¤¿Ê¸»úÎó¤È (¼«Æ°Åª¤ËÄɲ䵤ì¤ë)
-¥Ì¥ë½ªÃ¼Ê¸»ú (\(aq\\0\(aq) ¤ò³ÊǼ¤¹¤ë¤Î¤Ë½½Ê¬¤ÊÂ礭¤µ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
+¤½¤Îʸ»úÇÛÎó¤Ï¡¢ÆþÎϤµ¤ì¤¿Ê¸»úÎó¤È (¼«Æ°Åª¤ËÄɲ䵤ì¤ë) ½ªÃ¼¤Î NULL
+¥Ð¥¤¥È (\(aq\\0\(aq) ¤ò³ÊǼ¤¹¤ë¤Î¤Ë½½Ê¬¤ÊÂ礭¤µ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
 ʸ»úÎó¤ÎÆþÎϤϡ¢¥Û¥ï¥¤¥È¥¹¥Ú¡¼¥¹¤¬ÆþÎϤµ¤ì¤ë¤«¡¢ºÇÂç¥Õ¥£¡¼¥ë¥ÉÉý¤Ë
 㤹¤ë¤«¡¢¤Î¤É¤Á¤é¤«¤¬µ¯¤³¤ë¤ÈÄä»ß¤µ¤ì¤ë¡£
 .TP