From 106b481c4fb7790f93944c6f40ef39a1f1b3058e Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 4 Apr 2006 17:17:25 +0100 Subject: [PATCH] cleanup: Various aesthetic fiddlings of little consequence. --- ec-info.c | 2 +- mpmont-exp.c | 1 - mpreduce.c | 12 ++++++------ mptypes.c | 2 +- mpx.c | 8 ++------ tests/mpreduce | 2 +- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ec-info.c b/ec-info.c index 925ff07..3a5b096 100644 --- a/ec-info.c +++ b/ec-info.c @@ -571,7 +571,7 @@ int main(int argc, char *argv[]) e = ec_checkinfo(&ei, gr); ec_freeinfo(&ei); if (e) { - printf(" [%s fails: %s]", ee->name, e); + printf(" [%s fails: %s]", ee->name, e); ok = 0; } else printf(" %s", ee->name); diff --git a/mpmont-exp.c b/mpmont-exp.c index 0caf118..301a0d8 100644 --- a/mpmont-exp.c +++ b/mpmont-exp.c @@ -130,7 +130,6 @@ static int texp(dstr *v) return ok; } - static test_chunk tests[] = { { "exp", texp, { &type_mp, &type_mp, &type_mp, &type_mp, 0 } }, { 0, 0, { 0 } }, diff --git a/mpreduce.c b/mpreduce.c index d99ff16..0f20ed8 100644 --- a/mpreduce.c +++ b/mpreduce.c @@ -285,9 +285,9 @@ mp *mpreduce_do(mpreduce *r, mp *d, mp *x) *vl = 0; run(r->iv, il, vl, z); #ifdef DEBUG - MP_PRINTX("x", x); - mp_div(0, &_rr, x, r->p); - assert(MP_EQ(_r, _rr)); + MP_PRINTX("x", x); + mp_div(0, &_rr, x, r->p); + assert(MP_EQ(_r, _rr)); #endif } } @@ -297,9 +297,9 @@ mp *mpreduce_do(mpreduce *r, mp *d, mp *x) *vl &= ((1 << r->s) - 1); run(r->iv + r->in, il + r->in, vl, z); #ifdef DEBUG - MP_PRINTX("x", x); - mp_div(0, &_rr, x, r->p); - assert(MP_EQ(_r, _rr)); + MP_PRINTX("x", x); + mp_div(0, &_rr, x, r->p); + assert(MP_EQ(_r, _rr)); #endif } } diff --git a/mptypes.c b/mptypes.c index 922eae4..613e214 100644 --- a/mptypes.c +++ b/mptypes.c @@ -60,7 +60,7 @@ typedef uintmax_t umax; # define P_UMAX PRIuMAX #elif defined(ULLONG_MAX) - __extension__ typedef unsigned long long umax; + EXT typedef unsigned long long umax; # define P_UMAX "llu" #else typedef unsigned long umax; diff --git a/mpx.c b/mpx.c index 5fc522a..c6a23be 100644 --- a/mpx.c +++ b/mpx.c @@ -995,9 +995,7 @@ void mpx_umul(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl, */ void mpx_umuln(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl, mpw m) -{ - MPX_UMULN(dv, dvl, av, avl, m); -} + { MPX_UMULN(dv, dvl, av, avl, m); } /* --- @mpx_umlan@ --- * * @@ -1012,9 +1010,7 @@ void mpx_umuln(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl, mpw m) */ void mpx_umlan(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl, mpw m) -{ - MPX_UMLAN(dv, dvl, av, avl, m); -} + { MPX_UMLAN(dv, dvl, av, avl, m); } /* --- @mpx_usqr@ --- * * diff --git a/tests/mpreduce b/tests/mpreduce index 1734b18..9a74b99 100644 --- a/tests/mpreduce +++ b/tests/mpreduce @@ -13,7 +13,7 @@ reduce { } modexp { - 0xfffffffdffffffffffffffffffffffff 0xfffffffdfffffffffffffffffffffffe 0 1; + 0xfffffffdffffffffffffffffffffffff 0xfffffffdfffffffffffffffffffffffe 0 1; 0xfffffffdffffffffffffffffffffffff 2 0xfffffffdfffffffffffffffffffffffe 1; 0xfffffffdffffffffffffffffffffffff 2 -- 2.11.0