summaryrefslogtreecommitdiffstats
path: root/base/rand_util.cc
diff options
context:
space:
mode:
authordilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 19:58:36 +0000
committerdilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 19:58:36 +0000
commit0173b96374dacfa596c6700b4c1b2ab6abc35f90 (patch)
treeb32617dd8c294f78beb5683496c044d89ce1c632 /base/rand_util.cc
parentba51d3b367da614cfe531c2a55de99cd27bd3582 (diff)
downloadchromium_src-0173b96374dacfa596c6700b4c1b2ab6abc35f90.zip
chromium_src-0173b96374dacfa596c6700b4c1b2ab6abc35f90.tar.gz
chromium_src-0173b96374dacfa596c6700b4c1b2ab6abc35f90.tar.bz2
Fix variable names and comments in RandGenerator.
(No semantic change intended). BUG=None TEST=None Review URL: http://codereview.chromium.org/7685053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/rand_util.cc')
-rw-r--r--base/rand_util.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/base/rand_util.cc b/base/rand_util.cc
index e556c07..fcbccef 100644
--- a/base/rand_util.cc
+++ b/base/rand_util.cc
@@ -43,22 +43,21 @@ double BitsToOpenEndedUnitInterval(uint64 bits) {
return result;
}
-uint64 RandGenerator(uint64 max) {
- DCHECK_GT(max, 0ULL);
-
+uint64 RandGenerator(uint64 range) {
+ DCHECK_GT(range, 0u);
// We must discard random results above this number, as they would
// make the random generator non-uniform (consider e.g. if
- // MAX_UINT64 was 4 and max was 3, then a result of 1 would be twice
- // as likely as a result of 0 or 2).
+ // MAX_UINT64 was 7 and |range| was 5, then a result of 1 would be twice
+ // as likely as a result of 3 or 4).
uint64 max_acceptable_value =
- (std::numeric_limits<uint64>::max() / max) * max;
+ (std::numeric_limits<uint64>::max() / range) * range - 1;
uint64 value;
do {
value = base::RandUint64();
- } while (value >= max_acceptable_value);
+ } while (value > max_acceptable_value);
- return value % max;
+ return value % range;
}
void RandBytes(void* output, size_t output_length) {