Commit 8e21616ab22e34afb91d9b89910dbb8db06c64f5
2019-10-27T13:12:28
Merge pull request #411 from fperrad/20191024_lint some linting
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
diff --git a/etc/pprime.c b/etc/pprime.c
index 411e446..1d59cab 100644
--- a/etc/pprime.c
+++ b/etc/pprime.c
@@ -6,7 +6,7 @@
*/
#include <stdlib.h>
#include <time.h>
-#include "tommath.h"
+#include "tommath_private.h"
static int n_prime;
static FILE *primes;
diff --git a/mp_div.c b/mp_div.c
index 5fd9572..e9f4f50 100644
--- a/mp_div.c
+++ b/mp_div.c
@@ -27,7 +27,7 @@ mp_err mp_div(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d)
if (MP_HAS(S_MP_DIV_RECURSIVE)
&& (b->used > MP_KARATSUBA_MUL_CUTOFF)
- && (b->used <= ((a->used)/3*2))) {
+ && (b->used <= ((a->used/3)*2))) {
err = s_mp_div_recursive(a, b, c, d);
} else if (MP_HAS(S_MP_DIV_SCHOOL)) {
err = s_mp_div_school(a, b, c, d);
diff --git a/mp_log_u32.c b/mp_log_u32.c
index 5568568..cff9e48 100644
--- a/mp_log_u32.c
+++ b/mp_log_u32.c
@@ -17,7 +17,7 @@ mp_err mp_log_u32(const mp_int *a, uint32_t base, uint32_t *c)
return MP_VAL;
}
- if (MP_HAS(S_MP_LOG_POW2) && (base & (base - 1u)) == 0u) {
+ if (MP_HAS(S_MP_LOG_POW2) && ((base & (base - 1u)) == 0u)) {
*c = s_mp_log_pow2(a, base);
return MP_OKAY;
}
diff --git a/s_mp_div_recursive.c b/s_mp_div_recursive.c
index 67b4a05..d641123 100644
--- a/s_mp_div_recursive.c
+++ b/s_mp_div_recursive.c
@@ -48,7 +48,7 @@ static mp_err s_mp_recursion(const mp_int *a, const mp_int *b, mp_int *q, mp_int
/* while A1 < 0 do Q1 = Q1 - 1, A1 = A1 + (beta^k * B) */
if ((err = mp_mul_2d(b, k * MP_DIGIT_BIT, &t)) != MP_OKAY) goto LBL_ERR;
- while (mp_cmp_d(&A1, 0) == MP_LT) {
+ while (mp_cmp_d(&A1, 0uL) == MP_LT) {
if ((err = mp_decr(&Q1)) != MP_OKAY) goto LBL_ERR;
if ((err = mp_add(&A1, &t, &A1)) != MP_OKAY) goto LBL_ERR;
}
@@ -64,7 +64,7 @@ static mp_err s_mp_recursion(const mp_int *a, const mp_int *b, mp_int *q, mp_int
if ((err = mp_sub(&A2, &t, &A2)) != MP_OKAY) goto LBL_ERR;
/* while A2 < 0 do Q0 = Q0 - 1, A2 = A2 + B */
- while (mp_cmp_d(&A2, 0) == MP_LT) {
+ while (mp_cmp_d(&A2, 0uL) == MP_LT) {
if ((err = mp_decr(&Q0)) != MP_OKAY) goto LBL_ERR;
if ((err = mp_add(&A2, b, &A2)) != MP_OKAY) goto LBL_ERR;
}
diff --git a/tommath_private.h b/tommath_private.h
index f3aeb8f..a03ae41 100644
--- a/tommath_private.h
+++ b/tommath_private.h
@@ -167,7 +167,7 @@ typedef unsigned long mp_word __attribute__((mode(TI)));
typedef uint64_t mp_word;
#endif
-MP_STATIC_ASSERT(correct_word_size, sizeof(mp_word) == 2 * sizeof(mp_digit))
+MP_STATIC_ASSERT(correct_word_size, sizeof(mp_word) == (2u * sizeof(mp_digit)))
/* default precision */
#ifndef MP_PREC