Author: aurel32
Date: 2007-04-14 15:30:45 +0000 (Sat, 14 Apr 2007)
New Revision: 2062
Removed:
glibc-package/trunk/debian/patches/any/cvs-printf_fp.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/cvs-printf_fp-c.diff
glibc-package/trunk/debian/patches/series
Log:
Merge cvs-printf_fp.diff into cvs-printf_fp-c.diff
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-14 15:25:37 UTC (rev
2061)
+++ glibc-package/trunk/debian/changelog 2007-04-14 15:30:45 UTC (rev
2062)
@@ -28,8 +28,8 @@
* debian/local/manpages/tzconfig.8: removed.
* debian/sysdeps/depflags.pl: conflict with tzdata (<< 2007e-2). Older
versions need tzconfig.
- * patches/any/cvs-printf_fp.diff: new patch (fix exponent -4 special
- case handling when wcp == wstartp + 1) from CVS. Closes: #419225.
+ * patches/any/cvs-printf_fp-c.diff: update patch from CVS (fix exponent
+ -4 special case handling when wcp == wstartp + 1). Closes: #419225.
-- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 14 Apr 2007 17:23:17 +0200
Modified: glibc-package/trunk/debian/patches/any/cvs-printf_fp-c.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-printf_fp-c.diff 2007-04-14
15:25:37 UTC (rev 2061)
+++ glibc-package/trunk/debian/patches/any/cvs-printf_fp-c.diff 2007-04-14
15:30:45 UTC (rev 2062)
@@ -1,3 +1,8 @@
+2007-04-13 Jakub Jelinek <[EMAIL PROTECTED]>
+
+ * stdio-common/printf_fp.c (___printf_fp): Fix exponent -4
+ special case handling when wcp == wstartp + 1.
+
2007-02-21 Ulrich Drepper <[EMAIL PROTECTED]>
[BZ #4070]
@@ -188,3 +193,26 @@
{
free (buffer);
free (wbuffer);
+--- libc/stdio-common/printf_fp.c.jj 2007-02-26 18:13:47.000000000 +0100
++++ libc/stdio-common/printf_fp.c 2007-04-13 16:03:38.000000000 +0200
+@@ -1081,12 +1081,18 @@
+ /* This is another special case. The exponent of the number is
+ really smaller than -4, which requires the 'e'/'E' format.
+ But after rounding the number has an exponent of -4. */
+- assert (wcp >= wstartp + 2);
++ assert (wcp >= wstartp + 1);
+ assert (wstartp[0] == L'1');
+ __wmemcpy (wstartp, L"0.0001", 6);
+ wstartp[1] = decimalwc;
+ wmemset (wstartp + 6, L'0', wcp - (wstartp + 2));
+- wcp += 4;
++ if (wcp >= wstartp + 2)
++ {
++ wmemset (wstartp + 6, L'0', wcp - (wstartp + 2));
++ wcp += 4;
++ }
++ else
++ wcp += 5;
+ }
+ else
+ {
Deleted: glibc-package/trunk/debian/patches/any/cvs-printf_fp.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-printf_fp.diff 2007-04-14
15:25:37 UTC (rev 2061)
+++ glibc-package/trunk/debian/patches/any/cvs-printf_fp.diff 2007-04-14
15:30:45 UTC (rev 2062)
@@ -1,28 +0,0 @@
-2007-04-13 Jakub Jelinek <[EMAIL PROTECTED]>
-
- * stdio-common/printf_fp.c (___printf_fp): Fix exponent -4
- special case handling when wcp == wstartp + 1.
-
---- libc/stdio-common/printf_fp.c.jj 2007-02-26 18:13:47.000000000 +0100
-+++ libc/stdio-common/printf_fp.c 2007-04-13 16:03:38.000000000 +0200
-@@ -1081,12 +1081,18 @@
- /* This is another special case. The exponent of the number is
- really smaller than -4, which requires the 'e'/'E' format.
- But after rounding the number has an exponent of -4. */
-- assert (wcp >= wstartp + 2);
-+ assert (wcp >= wstartp + 1);
- assert (wstartp[0] == L'1');
- __wmemcpy (wstartp, L"0.0001", 6);
- wstartp[1] = decimalwc;
- wmemset (wstartp + 6, L'0', wcp - (wstartp + 2));
-- wcp += 4;
-+ if (wcp >= wstartp + 2)
-+ {
-+ wmemset (wstartp + 6, L'0', wcp - (wstartp + 2));
-+ wcp += 4;
-+ }
-+ else
-+ wcp += 5;
- }
- else
- {
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-04-14 15:25:37 UTC (rev
2061)
+++ glibc-package/trunk/debian/patches/series 2007-04-14 15:30:45 UTC (rev
2062)
@@ -101,7 +101,6 @@
any/cvs-ftw-c.diff -p1
any/cvs-itoa-c.diff -p1
any/cvs-lt-update.diff -p0
-any/cvs-printf_fp.diff -p0
any/cvs-zdump-64-bit.diff -p1
any/local-notls.diff -p0
any/local-asserth-decls.diff -p0
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
