Commit e33311a1fed7dd03314155d7b89b557ac146c940
2019-10-19T17:14:46
use enum type
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142
diff --git a/etc/2kprime.c b/etc/2kprime.c
index 55cb5f4..fe25da3 100644
--- a/etc/2kprime.c
+++ b/etc/2kprime.c
@@ -8,7 +8,7 @@ int main(void)
{
char buf[2000];
size_t x;
- int y;
+ mp_bool y;
mp_int q, p;
FILE *out;
clock_t t1;
diff --git a/etc/drprime.c b/etc/drprime.c
index 146455e..73838c4 100644
--- a/etc/drprime.c
+++ b/etc/drprime.c
@@ -5,7 +5,8 @@ static int sizes[] = { 1+256/MP_DIGIT_BIT, 1+512/MP_DIGIT_BIT, 1+768/MP_DIGIT_BI
int main(void)
{
- int res, x, y;
+ mp_bool res;
+ int x, y;
char buf[4096];
FILE *out;
mp_int a, b;
diff --git a/etc/mersenne.c b/etc/mersenne.c
index f6d7cb6..7458472 100644
--- a/etc/mersenne.c
+++ b/etc/mersenne.c
@@ -5,10 +5,11 @@
#include <time.h>
#include <tommath.h>
-static int is_mersenne(long s, int *pp)
+static mp_err is_mersenne(long s, mp_bool *pp)
{
mp_int n, u;
- int res, k;
+ mp_err res;
+ int k;
*pp = 0;
@@ -102,7 +103,7 @@ static int isprime(long k)
int main(void)
{
- int pp;
+ mp_bool pp;
long k;
clock_t tt;
diff --git a/etc/pprime.c b/etc/pprime.c
index fa622f8..009a18c 100644
--- a/etc/pprime.c
+++ b/etc/pprime.c
@@ -179,10 +179,11 @@ static mp_digit prime_digit(void)
/* makes a prime of at least k bits */
-static int pprime(int k, int li, mp_int *p, mp_int *q)
+static mp_err pprime(int k, int li, mp_int *p, mp_int *q)
{
mp_int a, b, c, n, x, y, z, v;
- int res, ii;
+ mp_err res;
+ int ii;
static const mp_digit bases[] = { 2, 3, 5, 7, 11, 13, 17, 19 };
/* single digit ? */
diff --git a/etc/tune.c b/etc/tune.c
index 389ce2f..2260a70 100644
--- a/etc/tune.c
+++ b/etc/tune.c
@@ -61,7 +61,8 @@ static int s_offset = 1;
#define s_mp_mul(a, b, c) s_mp_mul_digs(a, b, c, (a)->used + (b)->used + 1)
static uint64_t s_time_mul(int size)
{
- int x, e;
+ int x;
+ mp_err e;
mp_int a, b, c, d;
uint64_t t1;
@@ -106,7 +107,8 @@ LBL_ERR:
static uint64_t s_time_sqr(int size)
{
- int x, e;
+ int x;
+ mp_err e;
mp_int a, b, c;
uint64_t t1;
diff --git a/mp_prime_next_prime.c b/mp_prime_next_prime.c
index 3e2571a..f8b2212 100644
--- a/mp_prime_next_prime.c
+++ b/mp_prime_next_prime.c
@@ -10,9 +10,10 @@
*/
mp_err mp_prime_next_prime(mp_int *a, int t, int bbs_style)
{
- int x, y, cmp;
- mp_err err;
- mp_bool res = MP_NO;
+ int x, y;
+ mp_ord cmp;
+ mp_err err;
+ mp_bool res = MP_NO;
mp_digit res_tab[MP_PRIME_TAB_SIZE], step, kstep;
mp_int b;
diff --git a/s_mp_toom_mul.c b/s_mp_toom_mul.c
index 0b2d57d..93113b8 100644
--- a/s_mp_toom_mul.c
+++ b/s_mp_toom_mul.c
@@ -32,7 +32,8 @@
mp_err s_mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c)
{
mp_int S1, S2, T1, a0, a1, a2, b0, b1, b2;
- int err, B, count;
+ int B, count;
+ mp_err err;
/* init temps */
if ((err = mp_init_multi(&S1, &S2, &T1, NULL)) != MP_OKAY) {
diff --git a/s_mp_toom_sqr.c b/s_mp_toom_sqr.c
index 884a532..67c465c 100644
--- a/s_mp_toom_sqr.c
+++ b/s_mp_toom_sqr.c
@@ -22,7 +22,8 @@ mp_err s_mp_toom_sqr(const mp_int *a, mp_int *b)
{
mp_int S0, a0, a1, a2;
mp_digit *tmpa, *tmpc;
- mp_err err, B, count;
+ int B, count;
+ mp_err err;
/* init temps */