removed unnecessary code

Author: czurnieden

demo/test.c

@@ -1223,7 +1223,6 @@ static int test_mp_read_radix(void)
          goto LBL_ERR;
       }
       DO(mp_rand(&a, bignum / MP_DIGIT_BIT));
-      /*fprintf(stderr,"\nNumber of limbs in &b = %d, bit_count of &b = %d\n", bignum / MP_DIGIT_BIT, mp_count_bits(&a));*/
       for (i = 2; i < 65; i++) {
          start = clock();
          for (j = 0; j < 100; j++) {

mp_read_radix.c

@@ -87,17 +87,13 @@ mp_err mp_read_radix(mp_int *a, const char *str, int radix)
    mp_zero(a);
 
    /* TODO: Reading is quite quick, especially for bases of the form 2^n. Faster even for small input.
-            Include branches fror them and/or (tunable?) cutoff? */
+            Include branches for them and/or (tunable?) cutoff? */
 
    /* Try faster version first */
    if (MP_HAS(S_MP_FASTER_READ_RADIX)) {
       if ((err = s_mp_faster_read_radix(a, str, 0, slen, radix)) != MP_OKAY)                             goto LTM_ERR;
    } else if (MP_HAS(S_MP_SLOWER_READ_RADIX)) {
       if ((err = s_mp_slower_read_radix(a, str, 0, slen, radix)) != MP_OKAY)                             goto LTM_ERR;
-   } else {
-      /* TODO: add an error for "Function not available in this build"? */
-      err = MP_ERR;
-      goto LTM_ERR;
    }
 
    /* set the sign only if a != 0 */

mp_to_radix.c

@@ -58,11 +58,6 @@ mp_err mp_to_radix(const mp_int *a, char *str, size_t maxlen, size_t *written, i
       str = start;
       /* part_written does not count EOS */
       part_written++;
-   } else {
-      /* TODO: Add an error for "Function not available in this build"?
-               The compiler has no reason to complain in that case. */
-      err = MP_ERR;
-      goto LBL_ERR;
    }
 
    if (written != NULL) {

s_mp_slower_read_radix.c

@@ -7,15 +7,10 @@ mp_err s_mp_slower_read_radix(mp_int *a, const char *str, size_t start, size_t e
 {
    mp_err err;
    size_t i;
-   int binary_radix = 0;
 
    /* checks are done by caller */
    char *_s = (char *)(str + start);
 
-   if (MP_IS_2EXPT((unsigned int)radix)) {
-      binary_radix = (int)s_mp_log2_radix[radix];
-   }
-
    for (i = start; (i < end) && (*_s != '\0')  ; i++) {
       uint8_t y;
 
@@ -31,12 +26,8 @@ mp_err s_mp_slower_read_radix(mp_int *a, const char *str, size_t start, size_t e
          err = MP_VAL;
          goto LBL_ERR;
       }
-      if (binary_radix != 0) {
-         if ((err = mp_mul_2d(a, binary_radix, a)) != MP_OKAY)                                            goto LBL_ERR;
-      } else {
-         if ((err = mp_mul_d(a, (mp_digit)radix, a)) != MP_OKAY)                                          goto LBL_ERR;
-      }
-      if ((err = mp_add_d(a, (mp_digit)y, a)) != MP_OKAY)                                                 goto LBL_ERR;
+      if ((err = mp_mul_d(a, (mp_digit)radix, a)) != MP_OKAY)                                          goto LBL_ERR;
+      if ((err = mp_add_d(a, (mp_digit)y, a)) != MP_OKAY)                                              goto LBL_ERR;
       _s++;
    }
 

s_mp_slower_to_radix.c

@@ -18,7 +18,6 @@ mp_err s_mp_slower_to_radix(const mp_int *a, char **str, size_t *part_maxlen, si
    size_t digs = 0u;
    mp_int t;
    mp_digit d;
-   int binary_radix = 0;
    mp_err err = MP_OKAY;
    int ybar = 0;
 
@@ -32,9 +31,6 @@ mp_err s_mp_slower_to_radix(const mp_int *a, char **str, size_t *part_maxlen, si
       ybar = s_mp_radix_exponent_y[radix] * MP_RADIX_BARRETT_START_MULTIPLICATOR;
    }
 
-   if (MP_IS_2EXPT((unsigned int)radix)) {
-      binary_radix = (int)s_mp_log2_radix[radix];
-   }
    if ((err = mp_init_copy(&t, a)) != MP_OKAY)                                                           goto LTM_ERR;
 
    while (!mp_iszero(&t)) {
@@ -43,13 +39,7 @@ mp_err s_mp_slower_to_radix(const mp_int *a, char **str, size_t *part_maxlen, si
          err = MP_BUF;
          goto LTM_ERR;
       }
-      if (binary_radix != 0) {
-         /* The remainder of function mp_div_2d() is a bigint not a mp_digit*/
-         d = t.dp[0] & (mp_digit)(radix - 1);
-         if ((err = mp_div_2d(&t, binary_radix, &t, NULL)) != MP_OKAY)                                    goto LTM_ERR;
-      } else {
-         if ((err = mp_div_d(&t, (mp_digit)radix, &t, &d)) != MP_OKAY)                                    goto LTM_ERR;
-      }
+      if ((err = mp_div_d(&t, (mp_digit)radix, &t, &d)) != MP_OKAY)                                    goto LTM_ERR;
       *s++ = s_mp_radix_map[d];
       ++digs;
       if (pad) {

tommath_class.h

@@ -1298,14 +1298,12 @@
 
 #if defined(S_MP_SLOWER_READ_RADIX_C)
 #   define MP_ADD_D_C
-#   define MP_MUL_2D_C
 #   define MP_MUL_D_C
 #   define MP_ZERO_C
 #endif
 
 #if defined(S_MP_SLOWER_TO_RADIX_C)
 #   define MP_CLEAR_C
-#   define MP_DIV_2D_C
 #   define MP_DIV_D_C
 #   define MP_INIT_COPY_C
 #endif