aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorTaylor R Campbell <campbell+tor@mumble.net>2019-01-10 18:08:20 +0000
committerGeorge Kadianakis <desnacked@riseup.net>2019-01-11 14:41:28 +0200
commitd82a8a7f9d268728b2447b2dbbaa346140784f9b (patch)
treec6ef75aa9a01885cba0f3bd3bdd99d8a1cfc21a6 /src/core
parent0f8253bddbaae4e73fe2ff9ecf1c342e3f66b798 (diff)
downloadtor-d82a8a7f9d268728b2447b2dbbaa346140784f9b.tar.gz
tor-d82a8a7f9d268728b2447b2dbbaa346140784f9b.zip
Add some more type checking.
NOTE: This commit breaks the build, because there was a mistake in an earlier change of exactly the sort that this is meant to detect! I'm leaving it broken for illustration.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/or/circuitpadding.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index a5d5d24551..4080614338 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -541,7 +541,7 @@ circpad_distribution_sample(circpad_distribution_t dist)
{
// param2 is upper bound, param1 is lower
const struct uniform my_uniform = {
- .base = DIST_BASE(&uniform_ops),
+ .base = UNIFORM(my_uniform),
.a = dist.param1,
.b = dist.param2,
};
@@ -551,7 +551,7 @@ circpad_distribution_sample(circpad_distribution_t dist)
{
/* param1 is Mu, param2 is sigma. */
const struct logistic my_logistic = {
- .base = DIST_BASE(&uniform_ops),
+ .base = LOGISTIC(my_uniform),
.mu = dist.param1,
.sigma = dist.param2,
};
@@ -561,7 +561,7 @@ circpad_distribution_sample(circpad_distribution_t dist)
{
/* param1 is Alpha, param2 is 1.0/Beta */
const struct log_logistic my_log_logistic = {
- .base = DIST_BASE(&log_logistic_ops),
+ .base = LOG_LOGISTIC(my_log_logistic),
.alpha = dist.param1,
.beta = dist.param2,
};
@@ -571,7 +571,7 @@ circpad_distribution_sample(circpad_distribution_t dist)
{
/* param1 is 'p' (success probability) */
const struct geometric my_geometric = {
- .base = DIST_BASE(&geometric_ops),
+ .base = GEOMETRIC(my_geometric),
.p = dist.param1,
};
return dist_sample(&my_geometric.base);
@@ -580,7 +580,7 @@ circpad_distribution_sample(circpad_distribution_t dist)
{
/* param1 is k, param2 is Lambda */
const struct weibull my_weibull = {
- .base = DIST_BASE(&weibull_ops),
+ .base = WEIBULL(my_weibull),
.k = dist.param1,
.lambda = dist.param2,
};
@@ -590,7 +590,7 @@ circpad_distribution_sample(circpad_distribution_t dist)
{
/* param1 is sigma, param2 is xi, no more params for mu so we use 0 */
const struct genpareto my_genpareto = {
- .base = DIST_BASE(&weibull_ops),
+ .base = GENPARETO(my_weibull),
.mu = 0,
.sigma = dist.param1,
.xi = dist.param2,