r2608 - in glibc-package/branches/glibc-2.7/debian: . patches patches/any
Author: madcoder
Date: 2007-10-27 08:39:26 +0000 (Sat, 27 Oct 2007)
New Revision: 2608
Removed:
glibc-package/branches/glibc-2.7/debian/patches/any/submitted-strfry.diff
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
remove the strfry patch
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 08:39:22 UTC (rev 2607)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 08:39:26 UTC (rev 2608)
@@ -1,8 +1,9 @@
glibc (2.7-0exp2) UNRELEASED; urgency=low
* Remove any/local-iconv-fix-trampoline.diff (obsolete).
+ * Remove any/submitted-strfry.diff (merged).
- -- Pierre Habouzit <madcoder@debian.org> Sat, 27 Oct 2007 10:29:01 +0200
+ -- Pierre Habouzit <madcoder@debian.org> Sat, 27 Oct 2007 10:32:57 +0200
glibc (2.7-0exp1) experimental; urgency=low
Deleted: glibc-package/branches/glibc-2.7/debian/patches/any/submitted-strfry.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/any/submitted-strfry.diff 2007-10-27 08:39:22 UTC (rev 2607)
+++ glibc-package/branches/glibc-2.7/debian/patches/any/submitted-strfry.diff 2007-10-27 08:39:26 UTC (rev 2608)
@@ -1,29 +0,0 @@
-Turn strfry() into a proper Fisher-Yates shuffle. This gives us exactly
-n! paths for a string with N characters, and since there are n! possible
-permutations, we get a one-to-one mapping, and all possibilities are
-equally likely.
-
---- string/strfry.c.orig
-+++ string/strfry.c
-@@ -37,16 +37,16 @@
- init = 1;
- }
-
-- len = strlen (string) - 1;
-- for (i = 0; i < len; ++i)
-+ len = strlen (string);
-+ for (i = 0; i < len - 1; ++i)
- {
- int32_t j;
- __random_r (&rdata, &j);
-- j = j % len + 1;
-+ j %= (len - i);
-
- char c = string[i];
-- string[i] = string[j];
-- string[j] = c;
-+ string[i] = string[j + i];
-+ string[j + i] = c;
- }
-
- return string;
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 08:39:22 UTC (rev 2607)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 08:39:26 UTC (rev 2608)
@@ -152,7 +152,6 @@
any/submitted-libgcc_s.so.diff -p0
any/submitted-longdouble.diff -p0
# any/submitted-rfc3484-sortv4.diff -p0
-# any/submitted-strfry.diff -p0
any/local-disable-nscd-host-caching.diff
any/submitted-fileops-and-signals.diff
any/local-missing-linux_types.h.diff
Reply to: