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

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

diff --git a/draft/man3/printf.3 b/draft/man3/printf.3
index e29342e..9639fd8 100644 (file)
--- a/draft/man3/printf.3
+++ b/draft/man3/printf.3
@@ -45,7 +45,7 @@
 .\" WORD: conversion specifier ÊÑ´¹»ØÄê»Ò
 .\" WORD: length modifier      Ťµ½¤¾þ»Ò
 .\"
-.TH PRINTF 3  2010-09-20 "GNU" "Linux Programmer's Manual"
+.TH PRINTF 3  2011-09-28 "GNU" "Linux Programmer's Manual"
 .\"O .SH NAME
 .SH ̾Á°
 .\"O printf, fprintf, sprintf, snprintf, vprintf, vfprintf, vsprintf,
@@ -150,7 +150,7 @@ or
 .\"O .BR vsnprintf ()
 .\"O write at most
 .\"O .I size
-.\"O bytes (including the trailing null byte (\(aq\e0\(aq)) to
+.\"O bytes (including the terminating null byte (\(aq\e0\(aq)) to
 .\"O .IR str .
 .BR snprintf ()
 ¤È
@@ -161,7 +161,7 @@ or
 .I str
 ¤Ë½ñ¤­¹þ¤à
 .RI ( size
-¤Ë¤Ïʸ»úÎó¤ò½ªÃ¼¤¹¤ë \(aq\e0\(aq ¤â¤ò´Þ¤Þ¤ì¤ë)¡£
+¤Ë¤Ïʸ»úÎó¤ò½ªÃ¼¤¹¤ë NULL ¥Ð¥¤¥È (\(aq\e0\(aq) ¤â¤ò´Þ¤Þ¤ì¤ë)¡£
 .PP
 .\"O The functions
 .\"O .BR vprintf (),
@@ -246,10 +246,9 @@ C99 
 .\"O .SS "Return value"
 .SS ÊÖ¤êÃÍ
 .\"O Upon successful return, these functions return the number of characters
-.\"O printed (not including the
-.\"O trailing \(aq\e0\(aq used to end output to strings).
+.\"O printed (excluding the null byte used to end output to strings).
 À®¸ù»þ¤Ë¤Ï¡¢¾åµ­¤Î´Ø¿ô¤Ï½ñ¤­¹þ¤Þ¤ì¤¿Ê¸»ú¿ô¤òÊÖ¤¹
-(ʸ»úÎó¤ÎºÇ¸å¤ò¼¨¤¹¤¿¤á¤Ë»ÈÍѤ¹¤ë \(aq\e0\(aq ¤Ï¿ô¤Ë´Þ¤Þ¤ì¤Ê¤¤)¡£
+(ʸ»úÎó¤ÎºÇ¸å¤ò¼¨¤¹¤¿¤á¤Ë»ÈÍѤ¹¤ë NULL ¥Ð¥¤¥È¤Ï¿ô¤Ë´Þ¤Þ¤ì¤Ê¤¤)¡£
 
 .\"O The functions
 .\"O .BR snprintf ()
@@ -257,9 +256,9 @@ C99 
 .\"O .BR vsnprintf ()
 .\"O do not write more than
 .\"O .I size
-.\"O bytes (including the trailing \(aq\e0\(aq).
+.\"O bytes (including the terminating null byte (\(aq\e0\(aq)).
 .\"O If the output was truncated due to this limit then the return value
-.\"O is the number of characters (not including the trailing \(aq\e0\(aq)
+.\"O is the number of characters (excluding the terminating null byte)
 .\"O which would have been written to the final string if enough space
 .\"O had been available.
 .\"O Thus, a return value of
@@ -273,10 +272,10 @@ C99 
 .I size
 ¥Ð¥¤¥È¤ò±Û¤¨¤ëʸ»ú¿ô¤ò½ñ¤­¹þ¤Þ¤Ê¤¤
 .RI ( size
-¤Ë¤Ïʸ»úÎó¤ò½ªÃ¼¤¹¤ë \(aq\e0\(aq ¤â¤ò´Þ¤Þ¤ì¤ë)¡£
+¤Ë¤Ïʸ»úÎó¤ò½ªÃ¼¤¹¤ë NULL ¥Ð¥¤¥È (\(aq\e0\(aq) ¤â´Þ¤Þ¤ì¤ë)¡£
 ¤³¤ÎÀ©¸Â¤Ë¤è¤Ã¤Æ½ÐÎϤ¬ÀÚ¤êµÍ¤á¤é¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢
 ¤â¤·½½Ê¬¤Ê¥¹¥Ú¡¼¥¹¤¬¤¢¤ì¤Ð½ñ¤­¹þ¤Þ¤ì¤¿¤Ç¤¢¤í¤¦Ê¸»ú¤Î¸Ä¿ô
-(ʸ»úÎó¤ò½ªÃ¼¤¹¤ë \(aq\e0\(aq ¤ò½ü¤¯) ¤òÊÖ¤¹¡£
+(ʸ»úÎó¤ò½ªÃ¼¤¹¤ë NULL ¥Ð¥¤¥È¤ò½ü¤¯) ¤òÊÖ¤¹¡£
 ½¾¤Ã¤Æ¡¢ÊÖ¤êÃͤ¬
 .I size
 °Ê¾å¤À¤Ã¤¿¾ì¹ç¡¢½ÐÎϤ¬ÀÚ¤êµÍ¤á¤é¤ì¤¿¤³¤È¤ò°ÕÌ£¤¹¤ë