Commit 84db6f9dbc48809ee3e2e0d7271d73a68a27fe27
2015-10-17T18:12:48
add parentheses for explicit operator precedence
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
diff --git a/tommath.h b/tommath.h
index 1391d95..b806c3b 100644
--- a/tommath.h
+++ b/tommath.h
@@ -25,11 +25,11 @@
#include <tommath_class.h>
#ifndef MIN
- #define MIN(x,y) ((x)<(y)?(x):(y))
+ #define MIN(x,y) (((x) < (y)) ? (x) : (y))
#endif
#ifndef MAX
- #define MAX(x,y) ((x)>(y)?(x):(y))
+ #define MAX(x,y) (((x) > (y)) ? (x) : (y))
#endif
#ifdef __cplusplus
@@ -200,7 +200,7 @@ extern int KARATSUBA_MUL_CUTOFF,
#endif
/* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */
-#define MP_WARRAY (1 << (sizeof(mp_word) * CHAR_BIT - 2 * DIGIT_BIT + 1))
+#define MP_WARRAY (1 << ((sizeof(mp_word) * CHAR_BIT) - (2 * DIGIT_BIT) + 1))
/* the infamous mp_int structure */
typedef struct {
@@ -246,8 +246,8 @@ int mp_init_size(mp_int *a, int size);
/* ---> Basic Manipulations <--- */
#define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO)
-#define mp_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO)
-#define mp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO)
+#define mp_iseven(a) ((((a)->used > 0) && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO)
+#define mp_isodd(a) ((((a)->used > 0) && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO)
#define mp_isneg(a) (((a)->sign) ? MP_YES : MP_NO)
/* set to zero */
@@ -639,14 +639,14 @@ int func_name (mp_int * a, type b) \
mp_zero (a); \
\
/* set four bits at a time */ \
- for (x = 0; x < sizeof(type) * 2; x++) { \
+ for (x = 0; x < (sizeof(type) * 2); x++) { \
/* shift the number up four bits */ \
if ((res = mp_mul_2d (a, 4, a)) != MP_OKAY) { \
return res; \
} \
\
/* OR in the top four bits of the source */ \
- a->dp[0] |= (b >> ((sizeof(type)) * 8 - 4)) & 15; \
+ a->dp[0] |= (b >> ((sizeof(type) * 8) - 4)) & 15; \
\
/* shift the source up to the next four bits */ \
b <<= 4; \