[前][次][番号順一覧][スレッド一覧]

ruby-changes:17527

From: nobu <ko1@a...>
Date: Tue, 19 Oct 2010 12:19:40 +0900 (JST)
Subject: [ruby-changes:17527] Ruby:r29532 (trunk): * vsnprintf.c (BSD_vfprintf): fix over-count of field size.

nobu	2010-10-19 12:19:30 +0900 (Tue, 19 Oct 2010)

  New Revision: 29532

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29532

  Log:
    * vsnprintf.c (BSD_vfprintf): fix over-count of field size.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_sprintf.rb
    trunk/vsnprintf.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29531)
+++ ChangeLog	(revision 29532)
@@ -1,3 +1,7 @@
+Tue Oct 19 12:19:25 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* vsnprintf.c (BSD_vfprintf): fix over-count of field size.
+
 Tue Oct 19 03:08:52 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* vsnprintf.c (BSD_vfprintf): use HEXPREFIX flag for prefix of %a.
Index: vsnprintf.c
===================================================================
--- vsnprintf.c	(revision 29531)
+++ vsnprintf.c	(revision 29532)
@@ -831,7 +831,6 @@
 				expsize = exponent(expstr, expt, ch + 'p' - 'a');
 				ch += 'x' - 'a';
 				size = expsize + ndig;
-				size += 2; /* 0x */
 				if (ndig > 1)
 					++size; /* floating point */
 			}
@@ -1028,7 +1027,7 @@
 long_len:
 		if (sign)
 			fieldsz++;
-		else if (flags & HEXPREFIX)
+		if (flags & HEXPREFIX)
 			fieldsz += 2;
 		realsz = dprec > fieldsz ? dprec : fieldsz;
 
Index: test/ruby/test_sprintf.rb
===================================================================
--- test/ruby/test_sprintf.rb	(revision 29531)
+++ test/ruby/test_sprintf.rb	(revision 29532)
@@ -219,6 +219,8 @@
     assert_equal("-0x01.2p+0", sprintf("%010a", -1.125), bug3962)
     assert_equal("-0x01.1p+0", sprintf("%010a", -1.0625), bug3962)
     assert_equal("-0x1.08p+0", sprintf("%010a", -1.03125), bug3962)
+    assert_equal("0x000000000000001p+0", sprintf("%020a", 1), bug3962)
+    assert_equal("-0x00000000000001p+0", sprintf("%020a", -1), bug3962)
   end
 
   BSIZ = 120

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]