Author: madcoder
Date: 2007-05-20 15:51:23 +0000 (Sun, 20 May 2007)
New Revision: 2263
Removed:
glibc-package/branches/glibc-2.6/debian/patches/any/cvs-printf_fp-c.diff
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
more obsolete patches
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 15:46:20 UTC
(rev 2262)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 15:51:23 UTC
(rev 2263)
@@ -23,7 +23,7 @@
- Remove all/submitted-new-brf-encoding.diff (merged upstream).
- Remove any/cvs-2.5-branch-update.diff (obsolete).
- Remove any/cvs-pow.diff (obsolete).
- - Disable any/cvs-printf_fp-c.diff (broken).
+ - Remove any/cvs-printf_fp-c.diff (obsolete).
- Remove any/cvs-ftw-c.diff (obsolete).
- Remove any/cvs-bits_in_h-ipv6.diff (obsolete).
- Remove any/cvs-itoa-c.diff (obsolete).
@@ -56,7 +56,7 @@
(<< 2.17cvs20070426-1) for libc-dev. Closes: #422625.
* debian/local/etc_init.d/glibc.sh: fix a typo. Closes: #423870.
- -- Pierre Habouzit <[EMAIL PROTECTED]> Sun, 20 May 2007 17:45:36 +0200
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Sun, 20 May 2007 17:47:53 +0200
glibc (2.5-7) unstable; urgency=low
Deleted:
glibc-package/branches/glibc-2.6/debian/patches/any/cvs-printf_fp-c.diff
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/any/cvs-printf_fp-c.diff
2007-05-20 15:46:20 UTC (rev 2262)
+++ glibc-package/branches/glibc-2.6/debian/patches/any/cvs-printf_fp-c.diff
2007-05-20 15:51:23 UTC (rev 2263)
@@ -1,200 +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.
-
-2007-02-21 Ulrich Drepper <[EMAIL PROTECTED]>
-
- [BZ #4070]
- * stdio-common/printf_fp.c (___printf_fp): Handle a few more
- special cases.
-
-===================================================================
-RCS file: /cvs/glibc/libc/stdio-common/printf_fp.c,v
-retrieving revision 1.58
-retrieving revision 1.61
-diff -u -r1.58 -r1.61
---- libc/stdio-common/printf_fp.c 2006/04/25 18:38:30 1.58
-+++ libc/stdio-common/printf_fp.c 2007/02/21 08:56:40 1.61
-@@ -811,12 +811,14 @@
- int chars_needed;
- int expscale;
- int intdig_max, intdig_no = 0;
-- int fracdig_min, fracdig_max, fracdig_no = 0;
-+ int fracdig_min;
-+ int fracdig_max;
- int dig_max;
- int significant;
- int ngroups = 0;
-+ char spec = _tolower (info->spec);
-
-- if (_tolower (info->spec) == 'e')
-+ if (spec == 'e')
- {
- type = info->spec;
- intdig_max = 1;
-@@ -826,7 +828,7 @@
- dig_max = INT_MAX; /* Unlimited. */
- significant = 1; /* Does not matter here. */
- }
-- else if (_tolower (info->spec) == 'f')
-+ else if (spec == 'f')
- {
- type = 'f';
- fracdig_min = fracdig_max = info->prec < 0 ? 6 : info->prec;
-@@ -887,7 +889,7 @@
- other output. If the amount of memory we have to allocate is too
- large use `malloc' instead of `alloca'. */
- buffer_malloced = ! __libc_use_alloca (chars_needed * 2 * sizeof
(wchar_t));
-- if (buffer_malloced)
-+ if (__builtin_expect (buffer_malloced, 0))
- {
- wbuffer = (wchar_t *) malloc ((2 + chars_needed) * sizeof (wchar_t));
- if (wbuffer == NULL)
-@@ -923,7 +925,9 @@
- }
-
- /* Generate the needed number of fractional digits. */
-- while (fracdig_no < fracdig_min
-+ int fracdig_no = 0;
-+ int added_zeros = 0;
-+ while (fracdig_no < fracdig_min + added_zeros
- || (fracdig_no < fracdig_max && (fracsize > 1 || frac[0] != 0)))
- {
- ++fracdig_no;
-@@ -934,7 +938,7 @@
- {
- ++fracdig_max;
- if (fracdig_min > 0)
-- ++fracdig_min;
-+ ++added_zeros;
- }
- }
-
-@@ -971,11 +975,23 @@
- {
- /* Process fractional digits. Terminate if not rounded or
- radix character is reached. */
-+ int removed = 0;
- while (*--wtp != decimalwc && *wtp == L'9')
-- *wtp = '0';
-+ {
-+ *wtp = L'0';
-+ ++removed;
-+ }
-+ if (removed == fracdig_min && added_zeros > 0)
-+ --added_zeros;
- if (*wtp != decimalwc)
- /* Round up. */
- (*wtp)++;
-+ else if (__builtin_expect (spec == 'g' && type == 'f' && info->alt,
-+ 0))
-+ /* This is a special case: the rounded number is 1.0,
-+ the format is 'g' or 'G', and the alternative format
-+ is selected. This means the result mist be "1.". */
-+ --added_zeros;
- }
-
- if (fracdig_no == 0 || *wtp == decimalwc)
-@@ -1042,7 +1058,7 @@
-
- do_expo:
- /* Now remove unnecessary '0' at the end of the string. */
-- while (fracdig_no > fracdig_min && *(wcp - 1) == L'0')
-+ while (fracdig_no > fracdig_min + added_zeros && *(wcp - 1) == L'0')
- {
- --wcp;
- --fracdig_no;
-@@ -1060,26 +1076,46 @@
- /* Write the exponent if it is needed. */
- if (type != 'f')
- {
-- *wcp++ = (wchar_t) type;
-- *wcp++ = expsign ? L'-' : L'+';
--
-- /* Find the magnitude of the exponent. */
-- expscale = 10;
-- while (expscale <= exponent)
-- expscale *= 10;
--
-- if (exponent < 10)
-- /* Exponent always has at least two digits. */
-- *wcp++ = L'0';
-+ if (__builtin_expect (expsign != 0 && exponent == 4 && spec == 'g', 0))
-+ {
-+ /* 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 + 1);
-+ assert (wstartp[0] == L'1');
-+ __wmemcpy (wstartp, L"0.0001", 6);
-+ wstartp[1] = decimalwc;
-+ if (wcp >= wstartp + 2)
-+ {
-+ wmemset (wstartp + 6, L'0', wcp - (wstartp + 2));
-+ wcp += 4;
-+ }
-+ else
-+ wcp += 5;
-+ }
- else
-- do
-- {
-- expscale /= 10;
-- *wcp++ = L'0' + (exponent / expscale);
-- exponent %= expscale;
-- }
-- while (expscale > 10);
-- *wcp++ = L'0' + exponent;
-+ {
-+ *wcp++ = (wchar_t) type;
-+ *wcp++ = expsign ? L'-' : L'+';
-+
-+ /* Find the magnitude of the exponent. */
-+ expscale = 10;
-+ while (expscale <= exponent)
-+ expscale *= 10;
-+
-+ if (exponent < 10)
-+ /* Exponent always has at least two digits. */
-+ *wcp++ = L'0';
-+ else
-+ do
-+ {
-+ expscale /= 10;
-+ *wcp++ = L'0' + (exponent / expscale);
-+ exponent %= expscale;
-+ }
-+ while (expscale > 10);
-+ *wcp++ = L'0' + exponent;
-+ }
- }
-
- /* Compute number of characters which must be filled with the padding
-@@ -1120,15 +1156,14 @@
- else
- thousands_sep_len = strlen (thousands_sep);
-
-- if (buffer_malloced)
-+ if (__builtin_expect (buffer_malloced, 0))
- {
- buffer = (char *) malloc (2 + chars_needed + decimal_len
- + ngroups * thousands_sep_len);
- if (buffer == NULL)
- {
- /* Signal an error to the caller. */
-- if (buffer_malloced)
-- free (wbuffer);
-+ free (wbuffer);
- return -1;
- }
- }
-@@ -1162,7 +1197,7 @@
- PRINT (tmpptr, wstartp, wide ? wcp - wstartp : cp - tmpptr);
-
- /* Free the memory if necessary. */
-- if (buffer_malloced)
-+ if (__builtin_expect (buffer_malloced, 0))
- {
- free (buffer);
- free (wbuffer);
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20
15:46:20 UTC (rev 2262)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20
15:51:23 UTC (rev 2263)
@@ -87,7 +87,6 @@
all/local-ru_RU.diff
all/local-pt_BR.diff
-# any/cvs-printf_fp-c.diff -p1
any/local-notls.diff -p0
any/local-asserth-decls.diff -p0
# any/local-base.diff -p0 # g: suspended
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
