Skip to content

Commit 201819b

Browse files
sipasipa
committed
Merge pull request bitcoin#313
912f203 Eliminate a few unbraced statements that crept into the code. (Gregory Maxwell)
2 parents eeab823 + 912f203 commit 201819b

File tree

10 files changed

+85
-53
lines changed

10 files changed

+85
-53
lines changed

‎src/bench.h‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ static double gettimedouble(void) {
2020
void print_number(double x) {
2121
double y = x;
2222
int c = 0;
23-
if (y < 0.0) y = -y;
23+
if (y < 0.0) {
24+
y = -y;
25+
}
2426
while (y < 100.0) {
2527
y *= 10.0;
2628
c++;
@@ -35,13 +37,21 @@ void run_benchmark(char *name, void (*benchmark)(void*), void (*setup)(void*), v
3537
double max = 0.0;
3638
for (i = 0; i < count; i++) {
3739
double begin, total;
38-
if (setup) setup(data);
40+
if (setup) {
41+
setup(data);
42+
}
3943
begin = gettimedouble();
4044
benchmark(data);
4145
total = gettimedouble() - begin;
42-
if (teardown) teardown(data);
43-
if (total < min) min = total;
44-
if (total > max) max = total;
46+
if (teardown) {
47+
teardown(data);
48+
}
49+
if (total < min) {
50+
min = total;
51+
}
52+
if (total > max) {
53+
max = total;
54+
}
4555
sum += total;
4656
}
4757
printf("%s: min ", name);

‎src/bench_ecdh.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ static void bench_ecdh_setup(void* arg) {
2929
};
3030

3131
data->ctx = secp256k1_context_create(0);
32-
for (i = 0; i < 32; i++) data->scalar[i] = i + 1;
32+
for (i = 0; i < 32; i++) {
33+
data->scalar[i] = i + 1;
34+
}
3335
CHECK(secp256k1_ec_pubkey_parse(data->ctx, &data->point, point, sizeof(point)) == 1);
3436
}
3537

‎src/bench_internal.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,9 @@ int have_flag(int argc, char** argv, char *flag) {
307307
return 1;
308308
}
309309
while (argv != NULL && argv != argm) {
310-
if (strcmp(*argv, flag) == 0) return 1;
310+
if (strcmp(*argv, flag) == 0) {
311+
return 1;
312+
}
311313
argv++;
312314
}
313315
return 0;

‎src/bench_recover.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,12 @@ void bench_recover_setup(void* arg) {
4040
int i;
4141
bench_recover_t *data = (bench_recover_t*)arg;
4242

43-
for (i = 0; i < 32; i++) data->msg[i] = 1 + i;
44-
for (i = 0; i < 64; i++) data->sig[i] = 65 + i;
43+
for (i = 0; i < 32; i++) {
44+
data->msg[i] = 1 + i;
45+
}
46+
for (i = 0; i < 64; i++) {
47+
data->sig[i] = 65 + i;
48+
}
4549
}
4650

4751
int main(void) {

‎src/bench_schnorr_verify.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ static void benchmark_schnorr_init(void* arg) {
3030
int i, k;
3131
benchmark_schnorr_verify_t* data = (benchmark_schnorr_verify_t*)arg;
3232

33-
for (i = 0; i < 32; i++) data->msg[i] = 1 + i;
33+
for (i = 0; i < 32; i++) {
34+
data->msg[i] = 1 + i;
35+
}
3436
for (k = 0; k < data->numsigs; k++) {
3537
secp256k1_pubkey_t pubkey;
36-
for (i = 0; i < 32; i++) data->sigs[k].key[i] = 33 + i + k;
38+
for (i = 0; i < 32; i++) {
39+
data->sigs[k].key[i] = 33 + i + k;
40+
}
3741
secp256k1_schnorr_sign(data->ctx, data->sigs[k].sig, data->msg, data->sigs[k].key, NULL, NULL);
3842
data->sigs[k].pubkeylen = 33;
3943
CHECK(secp256k1_ec_pubkey_create(data->ctx, &pubkey, data->sigs[k].key));

‎src/bench_sign.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,12 @@ static void bench_sign_setup(void* arg) {
1818
int i;
1919
bench_sign_t *data = (bench_sign_t*)arg;
2020

21-
for (i = 0; i < 32; i++) data->msg[i] = i + 1;
22-
for (i = 0; i < 32; i++) data->key[i] = i + 65;
21+
for (i = 0; i < 32; i++) {
22+
data->msg[i] = i + 1;
23+
}
24+
for (i = 0; i < 32; i++) {
25+
data->key[i] = i + 65;
26+
}
2327
}
2428

2529
static void bench_sign(void* arg) {

‎src/bench_verify.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,12 @@ int main(void) {
4848

4949
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
5050

51-
for (i = 0; i < 32; i++) data.msg[i] = 1 + i;
52-
for (i = 0; i < 32; i++) data.key[i] = 33 + i;
51+
for (i = 0; i < 32; i++) {
52+
data.msg[i] = 1 + i;
53+
}
54+
for (i = 0; i < 32; i++) {
55+
data.key[i] = 33 + i;
56+
}
5357
data.siglen = 72;
5458
CHECK(secp256k1_ecdsa_sign(data.ctx, &sig, data.msg, data.key, NULL, NULL));
5559
CHECK(secp256k1_ecdsa_signature_serialize_der(data.ctx, data.sig, &data.siglen, &sig));

‎src/group_impl.h‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -112,42 +112,40 @@ static void secp256k1_ge_set_table_gej_var(size_t len, secp256k1_ge_t *r, const
112112
size_t i = len - 1;
113113
secp256k1_fe_t zi;
114114

115-
if (len < 1)
116-
return;
117-
118-
/* Compute the inverse of the last z coordinate, and use it to compute the last affine output. */
119-
secp256k1_fe_inv(&zi, &a[i].z);
120-
secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zi);
121-
122-
/* Work out way backwards, using the z-ratios to scale the x/y values. */
123-
while (i > 0) {
124-
secp256k1_fe_mul(&zi, &zi, &zr[i]);
125-
i--;
115+
if (len > 0) {
116+
/* Compute the inverse of the last z coordinate, and use it to compute the last affine output. */
117+
secp256k1_fe_inv(&zi, &a[i].z);
126118
secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zi);
119+
120+
/* Work out way backwards, using the z-ratios to scale the x/y values. */
121+
while (i > 0) {
122+
secp256k1_fe_mul(&zi, &zi, &zr[i]);
123+
i--;
124+
secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zi);
125+
}
127126
}
128127
}
129128

130129
static void secp256k1_ge_globalz_set_table_gej(size_t len, secp256k1_ge_t *r, secp256k1_fe_t *globalz, const secp256k1_gej_t *a, const secp256k1_fe_t *zr) {
131130
size_t i = len - 1;
132131
secp256k1_fe_t zs;
133132

134-
if (len < 1)
135-
return;
136-
137-
/* The z of the final point gives us the "global Z" for the table. */
138-
r[i].x = a[i].x;
139-
r[i].y = a[i].y;
140-
*globalz = a[i].z;
141-
r[i].infinity = 0;
142-
zs = zr[i];
143-
144-
/* Work our way backwards, using the z-ratios to scale the x/y values. */
145-
while (i > 0) {
146-
if (i != len - 1) {
147-
secp256k1_fe_mul(&zs, &zs, &zr[i]);
133+
if (len > 0) {
134+
/* The z of the final point gives us the "global Z" for the table. */
135+
r[i].x = a[i].x;
136+
r[i].y = a[i].y;
137+
*globalz = a[i].z;
138+
r[i].infinity = 0;
139+
zs = zr[i];
140+
141+
/* Work our way backwards, using the z-ratios to scale the x/y values. */
142+
while (i > 0) {
143+
if (i != len - 1) {
144+
secp256k1_fe_mul(&zs, &zs, &zr[i]);
145+
}
146+
i--;
147+
secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zs);
148148
}
149-
i--;
150-
secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zs);
151149
}
152150
}
153151

‎src/secp256k1.c‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,26 @@ secp256k1_context_t* secp256k1_context_clone(const secp256k1_context_t* ctx) {
8585
}
8686

8787
void secp256k1_context_destroy(secp256k1_context_t* ctx) {
88-
if (!ctx)
89-
return;
88+
if (ctx) {
89+
secp256k1_ecmult_context_clear(&ctx->ecmult_ctx);
90+
secp256k1_ecmult_gen_context_clear(&ctx->ecmult_gen_ctx);
9091

91-
secp256k1_ecmult_context_clear(&ctx->ecmult_ctx);
92-
secp256k1_ecmult_gen_context_clear(&ctx->ecmult_gen_ctx);
93-
94-
free(ctx);
92+
free(ctx);
93+
}
9594
}
9695

9796
void secp256k1_context_set_illegal_callback(secp256k1_context_t* ctx, void (*fun)(const char* message, void* data), const void* data) {
98-
if (!fun)
97+
if (!fun) {
9998
fun = default_illegal_callback_fn;
99+
}
100100
ctx->illegal_callback.fn = fun;
101101
ctx->illegal_callback.data = data;
102102
}
103103

104104
void secp256k1_context_set_error_callback(secp256k1_context_t* ctx, void (*fun)(const char* message, void* data), const void* data) {
105-
if (!fun)
105+
if (!fun) {
106106
fun = default_error_callback_fn;
107+
}
107108
ctx->error_callback.fn = fun;
108109
ctx->error_callback.data = data;
109110
}

‎src/tests.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1591,8 +1591,9 @@ void test_constant_wnaf(const secp256k1_scalar_t *number, int w) {
15911591
secp256k1_scalar_set_int(&shift, 1 << w);
15921592
/* With USE_ENDOMORPHISM on we only consider 128-bit numbers */
15931593
#ifdef USE_ENDOMORPHISM
1594-
for (i = 0; i < 16; ++i)
1594+
for (i = 0; i < 16; ++i) {
15951595
secp256k1_scalar_shr_int(&num, 8);
1596+
}
15961597
skew = secp256k1_wnaf_const(wnaf, num, w);
15971598
#else
15981599
secp256k1_wnaf_const(wnaf, num, w);
@@ -1733,10 +1734,12 @@ void test_scalar_split(void) {
17331734
secp256k1_scalar_split_lambda(&s1, &slam, &full);
17341735

17351736
/* check that both are <= 128 bits in size */
1736-
if (secp256k1_scalar_is_high(&s1))
1737+
if (secp256k1_scalar_is_high(&s1)) {
17371738
secp256k1_scalar_negate(&s1, &s1);
1738-
if (secp256k1_scalar_is_high(&slam))
1739+
}
1740+
if (secp256k1_scalar_is_high(&slam)) {
17391741
secp256k1_scalar_negate(&slam, &slam);
1742+
}
17401743

17411744
secp256k1_scalar_get_b32(tmp, &s1);
17421745
CHECK(memcmp(zero, tmp, 16) == 0);

0 commit comments

Comments
 (0)