summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-19 21:18:43 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-19 21:21:24 -0400
commitf2205071f02111c22b9fd26374cdce40d0c2389b (patch)
tree50106d560b6559f06082bebb94c02a5ecd9807a2
parent2775dd8649df80acf0f4f13f434363f28f64a4b8 (diff)
downloadtor-f2205071f02111c22b9fd26374cdce40d0c2389b.tar.gz
tor-f2205071f02111c22b9fd26374cdce40d0c2389b.zip
Remove round_int64_to_next_multiple_of: It is now unused.
-rw-r--r--src/common/util.c15
-rw-r--r--src/common/util.h1
-rw-r--r--src/test/test_util.c15
3 files changed, 0 insertions, 31 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 14deb4e37d..78afe5954f 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -513,21 +513,6 @@ round_uint64_to_next_multiple_of(uint64_t number, uint64_t divisor)
return number;
}
-/** Return the lowest x in [INT64_MIN, INT64_MAX] such that x is at least
- * <b>number</b>, and x modulo <b>divisor</b> == 0. If no such x can be
- * expressed as an int64_t, return INT64_MAX */
-int64_t
-round_int64_to_next_multiple_of(int64_t number, int64_t divisor)
-{
- tor_assert(divisor > 0);
- if (INT64_MAX - divisor + 1 < number)
- return INT64_MAX;
- if (number >= 0)
- number += divisor - 1;
- number -= number % divisor;
- return number;
-}
-
/** Transform a random value <b>p</b> from the uniform distribution in
* [0.0, 1.0[ into a Laplace distributed value with location parameter
* <b>mu</b> and scale parameter <b>b</b>. Truncate the final result
diff --git a/src/common/util.h b/src/common/util.h
index 814c8622a2..4c5070e65b 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -145,7 +145,6 @@ uint64_t round_to_power_of_2(uint64_t u64);
unsigned round_to_next_multiple_of(unsigned number, unsigned divisor);
uint32_t round_uint32_to_next_multiple_of(uint32_t number, uint32_t divisor);
uint64_t round_uint64_to_next_multiple_of(uint64_t number, uint64_t divisor);
-int64_t round_int64_to_next_multiple_of(int64_t number, int64_t divisor);
int64_t sample_laplace_distribution(double mu, double b, double p);
int64_t add_laplace_noise(int64_t signal, double random, double delta_f,
double epsilon);
diff --git a/src/test/test_util.c b/src/test/test_util.c
index a8802068a3..2726c31fe8 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -4223,21 +4223,6 @@ test_util_round_to_next_multiple_of(void *arg)
tt_u64_op(round_uint64_to_next_multiple_of(UINT64_MAX,2), ==,
UINT64_MAX);
- tt_i64_op(round_int64_to_next_multiple_of(0,1), ==, 0);
- tt_i64_op(round_int64_to_next_multiple_of(0,7), ==, 0);
-
- tt_i64_op(round_int64_to_next_multiple_of(99,1), ==, 99);
- tt_i64_op(round_int64_to_next_multiple_of(99,7), ==, 105);
- tt_i64_op(round_int64_to_next_multiple_of(99,9), ==, 99);
-
- tt_i64_op(round_int64_to_next_multiple_of(-99,1), ==, -99);
- tt_i64_op(round_int64_to_next_multiple_of(-99,7), ==, -98);
- tt_i64_op(round_int64_to_next_multiple_of(-99,9), ==, -99);
-
- tt_i64_op(round_int64_to_next_multiple_of(INT64_MIN,2), ==, INT64_MIN);
- tt_i64_op(round_int64_to_next_multiple_of(INT64_MAX,2), ==,
- INT64_MAX);
-
tt_int_op(round_uint32_to_next_multiple_of(0,1), ==, 0);
tt_int_op(round_uint32_to_next_multiple_of(0,7), ==, 0);