Commit e3598dc8b20b75fb15d365844a83c15ac53532f3
2018-02-02T17:44:40
explicit condition
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 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
diff --git a/demo/demo.c b/demo/demo.c
index 024eb66..9710151 100644
--- a/demo/demo.c
+++ b/demo/demo.c
@@ -696,7 +696,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
cmd[strlen(cmd) - 1] = 0;
printf("%-6s ]\r", cmd);
fflush(stdout);
- if (!strcmp(cmd, "mul2d")) {
+ if (strcmp(cmd, "mul2d") == 0) {
++mul2d_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -713,7 +713,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&b);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "div2d")) {
+ } else if (strcmp(cmd, "div2d") == 0) {
++div2d_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -733,7 +733,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&b);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "add")) {
+ } else if (strcmp(cmd, "add") == 0) {
++add_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -777,7 +777,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "sub")) {
+ } else if (strcmp(cmd, "sub") == 0) {
++sub_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -795,7 +795,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&d);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "mul")) {
+ } else if (strcmp(cmd, "mul") == 0) {
++mul_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -813,7 +813,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&d);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "div")) {
+ } else if (strcmp(cmd, "div") == 0) {
++div_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -837,7 +837,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "sqr")) {
+ } else if (strcmp(cmd, "sqr") == 0) {
++sqr_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -852,7 +852,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&c);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "gcd")) {
+ } else if (strcmp(cmd, "gcd") == 0) {
++gcd_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -871,7 +871,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&d);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "lcm")) {
+ } else if (strcmp(cmd, "lcm") == 0) {
++lcm_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -890,7 +890,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&d);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "expt")) {
+ } else if (strcmp(cmd, "expt") == 0) {
++expt_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -911,7 +911,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&e);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "invmod")) {
+ } else if (strcmp(cmd, "invmod") == 0) {
++inv_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -933,7 +933,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "div2")) {
+ } else if (strcmp(cmd, "div2") == 0) {
++div2_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -947,7 +947,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&c);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "mul2")) {
+ } else if (strcmp(cmd, "mul2") == 0) {
++mul2_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -961,7 +961,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
draw(&c);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "add_d")) {
+ } else if (strcmp(cmd, "add_d") == 0) {
++add_d_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -978,7 +978,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
printf("d == %d\n", ix);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "sub_d")) {
+ } else if (strcmp(cmd, "sub_d") == 0) {
++sub_d_n;
FGETS(buf, 4095, stdin);
mp_read_radix(&a, buf, 64);
@@ -995,7 +995,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE;
printf("d == %d\n", ix);
return EXIT_FAILURE;
}
- } else if (!strcmp(cmd, "exit")) {
+ } else if (strcmp(cmd, "exit") == 0) {
printf("\nokay, exiting now\n");
break;
}
diff --git a/demo/timing.c b/demo/timing.c
index 9080723..de58278 100644
--- a/demo/timing.c
+++ b/demo/timing.c
@@ -36,7 +36,7 @@ static unsigned long lfsr = 0xAAAAAAAAUL;
static int lbit(void)
{
- if (lfsr & 0x80000000UL) {
+ if ((lfsr & 0x80000000UL) != 0UL) {
lfsr = ((lfsr << 1) ^ 0x8000001BUL) & 0xFFFFFFFFUL;
return 1;
} else {
@@ -258,7 +258,7 @@ int main(void)
logb = FOPEN("logs/expt_dr.log", "w");
logc = FOPEN("logs/expt_2k.log", "w");
logd = FOPEN("logs/expt_2kl.log", "w");
- for (n = 0; primes[n]; n++) {
+ for (n = 0; primes[n] != NULL; n++) {
SLEEP;
mp_read_radix(&a, primes[n], 10);
mp_zero(&b);
@@ -283,7 +283,7 @@ int main(void)
mp_sub(&e, &b, &b);
mp_exptmod(&c, &b, &a, &e); /* c^(p-1-b) mod a */
mp_mulmod(&e, &d, &a, &d); /* c^b * c^(p-1-b) == c^p-1 == 1 */
- if (mp_cmp_d(&d, 1)) {
+ if (mp_cmp_d(&d, 1) != MP_EQ) {
printf("Different (%d)!!!\n", mp_count_bits(&a));
draw(&d);
exit(0);