From 9c73eae712243f8e4b915e45f8307e5e292008fa Mon Sep 17 00:00:00 2001 From: tege Date: Sun, 13 Jan 2002 15:36:02 +0100 Subject: Remove trailing spaces. --- mpf/div.c | 2 +- mpn/generic/dc_divrem_n.c | 2 +- mpn/generic/fib2_ui.c | 6 +++--- mpn/generic/gcd.c | 2 +- mpn/generic/mod_34lsub1.c | 2 +- mpn/generic/mode1o.c | 2 +- mpn/generic/mul_n.c | 18 +++++++++--------- mpn/generic/sb_divrem_mn.c | 2 +- mpq/get_str.c | 2 +- mpq/md_2exp.c | 4 ++-- mpq/set_f.c | 2 +- mpz/aorsmul_i.c | 2 +- mpz/bin_ui.c | 2 +- mpz/cong.c | 4 ++-- mpz/cong_2exp.c | 4 ++-- mpz/cong_ui.c | 2 +- mpz/divegcd.c | 4 ++-- mpz/divis.c | 2 +- mpz/divis_2exp.c | 2 +- mpz/fib_ui.c | 2 +- mpz/hamdist.c | 2 +- mpz/jacobi.c | 8 ++++---- mpz/kronsz.c | 2 +- mpz/kronuz.c | 2 +- mpz/kronzs.c | 2 +- mpz/kronzu.c | 2 +- mpz/lcm.c | 4 ++-- mpz/lucnum_ui.c | 2 +- mpz/mul.c | 4 ++-- mpz/n_pow_ui.c | 15 +++++++-------- mpz/powm_ui.c | 2 +- mpz/scan1.c | 2 +- rand.c | 4 ++-- randlc.c | 2 +- tests/rand/gen.c | 2 +- tests/rand/statlib.c | 8 ++++---- 36 files changed, 65 insertions(+), 66 deletions(-) diff --git a/mpf/div.c b/mpf/div.c index b3c3a5cf8..c8ce73442 100644 --- a/mpf/div.c +++ b/mpf/div.c @@ -88,7 +88,7 @@ mpf_div (mpf_ptr r, mpf_srcptr u, mpf_srcptr v) mp_ptr tmp; mp_limb_t nlimb; unsigned normalization_steps; - + count_leading_zeros (normalization_steps, vp[vsize - 1]); /* Shift up the divisor setting the most significant bit of diff --git a/mpn/generic/dc_divrem_n.c b/mpn/generic/dc_divrem_n.c index f8a14899a..15a8a35af 100644 --- a/mpn/generic/dc_divrem_n.c +++ b/mpn/generic/dc_divrem_n.c @@ -106,7 +106,7 @@ mpn_dc_divrem_n (mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n) static mp_limb_t mpn_dc_div_3_halves_by_2 (mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n) { - mp_size_t twon = n + n; + mp_size_t twon = n + n; mp_limb_t qhl, cc; mp_ptr tmp; TMP_DECL (marker); diff --git a/mpn/generic/fib2_ui.c b/mpn/generic/fib2_ui.c index ac7c42373..911a4a12f 100644 --- a/mpn/generic/fib2_ui.c +++ b/mpn/generic/fib2_ui.c @@ -26,7 +26,7 @@ MA 02111-1307, USA. */ /* change this to "#define TRACE(x) x" for diagnostics */ -#define TRACE(x) +#define TRACE(x) /* The following tables generated by code at the end of this file. */ @@ -326,7 +326,7 @@ mpn_fib2_ui (mp_ptr fp, mp_ptr f1p, unsigned long int n) fp==F[2k],f1p==F[2k-1] or fp==F[2k+1],f1p==F[2k], according as that bit is 0 or 1 respectively. */ - TRACE (printf ("k=%lu mask=0x%lX size=%ld alloc=%ld\n", + TRACE (printf ("k=%lu mask=0x%lX size=%ld alloc=%ld\n", n >> refmpn_count_trailing_zeros(mask), mask, size, alloc); mpn_trace ("fp ", fp, size); @@ -380,7 +380,7 @@ mpn_fib2_ui (mp_ptr fp, mp_ptr f1p, unsigned long int n) size -= (fp[size-1] == 0); } while (mask != 1); - + TMP_FREE (marker); } diff --git a/mpn/generic/gcd.c b/mpn/generic/gcd.c index 15a649355..cf87a2ad6 100644 --- a/mpn/generic/gcd.c +++ b/mpn/generic/gcd.c @@ -189,7 +189,7 @@ mpn_gcd (mp_ptr gp, mp_ptr up, mp_size_t usize, mp_ptr vp, mp_size_t vsize) count_leading_zeros (vzeros, vp[vsize-1]); ASSERT (uzeros <= vzeros); } -#endif +#endif ASSERT (! MPN_OVERLAP_P (up, usize, vp, vsize)); ASSERT (MPN_SAME_OR_SEPARATE2_P (gp, vsize, up, usize)); ASSERT (MPN_SAME_OR_SEPARATE2_P (gp, vsize, vp, vsize)); diff --git a/mpn/generic/mod_34lsub1.c b/mpn/generic/mod_34lsub1.c index e6b529f99..823c06d66 100644 --- a/mpn/generic/mod_34lsub1.c +++ b/mpn/generic/mod_34lsub1.c @@ -60,7 +60,7 @@ MA 02111-1307, USA. */ a += l; \ c += (a < l); \ } while (0) - + mp_limb_t mpn_mod_34lsub1 (mp_srcptr p, mp_size_t n) { diff --git a/mpn/generic/mode1o.c b/mpn/generic/mode1o.c index 64ec98413..a9ebf4be7 100644 --- a/mpn/generic/mode1o.c +++ b/mpn/generic/mode1o.c @@ -3,7 +3,7 @@ THE FUNCTIONS IN THIS FILE ARE FOR INTERNAL USE ONLY. THEY'RE ALMOST CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR COMPLETELY IN FUTURE GNU MP RELEASES. */ - + /* Copyright 2000, 2001 Free Software Foundation, Inc. diff --git a/mpn/generic/mul_n.c b/mpn/generic/mul_n.c index d1ac4ec08..67bea5d97 100644 --- a/mpn/generic/mul_n.c +++ b/mpn/generic/mul_n.c @@ -115,10 +115,10 @@ mpn_kara_mul_n (mp_ptr p, mp_srcptr a, mp_srcptr b, mp_size_t n, mp_ptr ws) else { i = n2; - do + do { --i; - w0 = b[i]; + w0 = b[i]; w1 = b[n3+i]; } while (w0 == w1 && i != 0); @@ -209,7 +209,7 @@ mpn_kara_mul_n (mp_ptr p, mp_srcptr a, mp_srcptr b, mp_size_t n, mp_ptr ws) mpn_sub_n (p, x, y, n2); i = n2; - do + do { --i; w0 = b[i]; @@ -357,7 +357,7 @@ mpn_kara_sqr_n (mp_ptr p, mp_srcptr a, mp_size_t n, mp_ptr ws) { /* Even length. */ i = n2; - do + do { --i; w0 = a[i]; @@ -473,7 +473,7 @@ evaluate3 (mp_ptr ph, mp_ptr p1, mp_ptr p2, mp_ptr pth, mp_ptr pt1, mp_ptr pt2, mp_srcptr A, mp_srcptr B, mp_srcptr C, mp_size_t len,mp_size_t len2) { mp_limb_t c, d, e; - + ASSERT (len - len2 <= 2); e = mpn_lshift (p1, B, len, 1); @@ -660,12 +660,12 @@ interpolate3 (mp_srcptr A, mp_ptr B, mp_ptr C, mp_ptr D, mp_srcptr E, #ifdef HAVE_MPN_ADD_SUB_N /* #error TO DO ... */ #else - t = tb + td + mpn_add_n (ws, B, D, len); + t = tb + td + mpn_add_n (ws, B, D, len); td = tb - td - mpn_sub_n (D, B, D, len); tb = t; MPN_COPY (B, ws, len); #endif - + /* b := b-8*c */ t = 8 * tc + mpn_lshift (ws, C, len, 3); tb -= t + mpn_sub_n (B, B, ws, len); @@ -681,7 +681,7 @@ interpolate3 (mp_srcptr A, mp_ptr B, mp_ptr C, mp_ptr D, mp_srcptr E, #ifdef HAVE_MPN_ADD_SUB_N /* #error TO DO ... */ #else - t = tb + td + mpn_add_n (ws, B, D, len); + t = tb + td + mpn_add_n (ws, B, D, len); td = tb - td - mpn_sub_n (D, B, D, len); tb = t; MPN_COPY (B, ws, len); @@ -1151,7 +1151,7 @@ mpn_mul_n (mp_ptr p, mp_srcptr a, mp_srcptr b, mp_size_t n) #if WANT_FFT || TUNE_PROGRAM_BUILD else { - mpn_mul_fft_full (p, a, n, b, n); + mpn_mul_fft_full (p, a, n, b, n); } #endif } diff --git a/mpn/generic/sb_divrem_mn.c b/mpn/generic/sb_divrem_mn.c index 21c0d4b98..bd0d6f8c6 100644 --- a/mpn/generic/sb_divrem_mn.c +++ b/mpn/generic/sb_divrem_mn.c @@ -199,7 +199,7 @@ mpn_sb_divrem_mn (mp_ptr qp, ______ ______ - |__p1__|__p0__| partial product to subtract ______ ______ - - |______|cylimb| + - |______|cylimb| rx is -1, 0 or 1. If rx=1, then q is correct (it should match carry out). If rx=-1 then q is too large. If rx=0, then q might diff --git a/mpq/get_str.c b/mpq/get_str.c index 38a836605..985ea3fab 100644 --- a/mpq/get_str.c +++ b/mpq/get_str.c @@ -62,6 +62,6 @@ mpq_get_str (char *str, int base, mpq_srcptr q) if (str_alloc != 0) __GMP_REALLOCATE_FUNC_MAYBE (str, str_alloc, len+1); - + return str; } diff --git a/mpq/md_2exp.c b/mpq/md_2exp.c index fd6e60c76..5c2a7dab3 100644 --- a/mpq/md_2exp.c +++ b/mpq/md_2exp.c @@ -66,7 +66,7 @@ mord_2exp (mpz_ptr ldst, mpz_ptr rdst, mpz_srcptr lsrc, mpz_srcptr rsrc, if (plow == 0) shift = n; else - { + { count_trailing_zeros (shift, plow); shift = MIN (shift, n); } @@ -89,7 +89,7 @@ mpq_mul_2exp (mpq_ptr dst, mpq_srcptr src, unsigned long n) mord_2exp (mpq_numref (dst), mpq_denref (dst), mpq_numref (src), mpq_denref (src), n); } - + void mpq_div_2exp (mpq_ptr dst, mpq_srcptr src, unsigned long n) { diff --git a/mpq/set_f.c b/mpq/set_f.c index e75d50b58..af1f21045 100644 --- a/mpq/set_f.c +++ b/mpq/set_f.c @@ -87,7 +87,7 @@ mpq_set_f (mpq_ptr q, mpf_srcptr f) den_size--; count_trailing_zeros (shift, flow); - + mpn_rshift (num_ptr, fptr, abs_fsize, shift); abs_fsize -= (num_ptr[abs_fsize-1] == 0); diff --git a/mpz/aorsmul_i.c b/mpz/aorsmul_i.c index 8fef90afd..239c0a823 100644 --- a/mpz/aorsmul_i.c +++ b/mpz/aorsmul_i.c @@ -126,7 +126,7 @@ mpz_aorsmul_1 (mpz_ptr w, mpz_srcptr x, mp_limb_t y, mp_size_t sub) cy = cy2 + mpn_add_1 (wp, wp, dsize, cy); } #endif - + wp[dsize] = cy; new_wsize += (cy != 0); } diff --git a/mpz/bin_ui.c b/mpz/bin_ui.c index a3ff12102..17beb11b5 100644 --- a/mpz/bin_ui.c +++ b/mpz/bin_ui.c @@ -48,7 +48,7 @@ mpz_bin_ui (mpz_ptr r, mpz_srcptr n, unsigned long int k) mpz_t nacc; mp_limb_t kacc; mp_size_t negate; - + if (mpz_sgn (n) < 0) { /* bin(n,k) = (-1)^k * bin(-n+k-1,k), and set ni = -n+k-1 - k = -n-1 */ diff --git a/mpz/cong.c b/mpz/cong.c index faa8db15d..d7fa9fe0f 100644 --- a/mpz/cong.c +++ b/mpz/cong.c @@ -142,9 +142,9 @@ mpz_congruent_p (mpz_srcptr a, mpz_srcptr c, mpz_srcptr d) is unnecessary, but the rest of that code is wanted. */ goto cong_1; } - } + } } - + TMP_MARK (marker); xp = TMP_ALLOC_LIMBS (asize+1); diff --git a/mpz/cong_2exp.c b/mpz/cong_2exp.c index f0069b6b8..53556130f 100644 --- a/mpz/cong_2exp.c +++ b/mpz/cong_2exp.c @@ -70,12 +70,12 @@ mpz_congruent_2exp_p (mpz_srcptr a, mpz_srcptr c, unsigned long d) /* if d covers all of a and c, then must be exactly equal */ if (asize <= dlimbs) return asize == csize; - + /* whole limbs zero */ for (i = csize; i < dlimbs; i++) if (ap[i] != 0) return 0; - + /* partial limb zero */ return (ap[dlimbs] & dmask) == 0; } diff --git a/mpz/cong_ui.c b/mpz/cong_ui.c index 416b1b853..2f3ea3f75 100644 --- a/mpz/cong_ui.c +++ b/mpz/cong_ui.c @@ -39,7 +39,7 @@ mpz_congruent_ui_p (mpz_srcptr a, unsigned long cu, unsigned long du) mp_size_t asize; mp_limb_t c, d, r; - if (du == 0) + if (du == 0) DIVIDE_BY_ZERO; asize = SIZ(a); diff --git a/mpz/divegcd.c b/mpz/divegcd.c index 3b19c973d..0997abe1b 100644 --- a/mpz/divegcd.c +++ b/mpz/divegcd.c @@ -36,14 +36,14 @@ MA 02111-1307, USA. */ 1 60.7% 2^k 20.2% (1<=k<32) 3*2^k 9.0% (1<=k<32) - other 10.1% + other 10.1% Only the low limb is examined for optimizations, since GCDs bigger than 2^32 (or 2^64) will occur very infrequently. Future: This could change to an mpn_divexact_gcd, possibly partly inlined, if/when the relevant mpq functions change to an mpn based - implementation. */ + implementation. */ static void diff --git a/mpz/divis.c b/mpz/divis.c index b071fce00..03333aeeb 100644 --- a/mpz/divis.c +++ b/mpz/divis.c @@ -30,7 +30,7 @@ mpz_divisible_p (mpz_srcptr a, mpz_srcptr d) int dsize; dsize = SIZ(d); - if (dsize == 0) + if (dsize == 0) DIVIDE_BY_ZERO; return mpn_divisible_p (PTR(a), (mp_size_t) ABSIZ(a), diff --git a/mpz/divis_2exp.c b/mpz/divis_2exp.c index 9392fde33..e0552e067 100644 --- a/mpz/divis_2exp.c +++ b/mpz/divis_2exp.c @@ -45,7 +45,7 @@ mpz_divisible_2exp_p (mpz_srcptr a, unsigned long d) for (i = 0; i < dlimbs; i++) if (ap[i] != 0) return 0; - + /* left over bits must be zero */ dbits = d % BITS_PER_MP_LIMB; dmask = (CNST_LIMB(1) << dbits) - 1; diff --git a/mpz/fib_ui.c b/mpz/fib_ui.c index 0514c13af..cc38a437a 100644 --- a/mpz/fib_ui.c +++ b/mpz/fib_ui.c @@ -117,7 +117,7 @@ mpz_fib_ui (mpz_ptr fn, unsigned long n) ASSERT (c != MP_LIMB_T_MAX); /* because it's the high of a mul */ c += mpn_add_1 (fp, fp, size-1, CNST_LIMB(2)); fp[size-1] = c; - } + } #endif } else diff --git a/mpz/hamdist.c b/mpz/hamdist.c index 2c26934b6..1c4cfb4cd 100644 --- a/mpz/hamdist.c +++ b/mpz/hamdist.c @@ -135,7 +135,7 @@ mpz_hamdist (mpz_srcptr u, mpz_srcptr v) popc_limb (twoscount, vlimb); count += twoscount; } - + /* Overlapping part of u and v, if any. Ones complement both, so just plain hamdist. */ step = MIN (usize, vsize); diff --git a/mpz/jacobi.c b/mpz/jacobi.c index 1afbe2e23..5711b10ce 100644 --- a/mpz/jacobi.c +++ b/mpz/jacobi.c @@ -143,7 +143,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b) /* account for effect of sign of a, then ignore it */ result_bit1 ^= JACOBI_ASGN_SU_BIT1 (asize, blow); asize = ABS (asize); - + if (bsize == 1 || (bsize == 2 && (bsecond >> btwos) == 0)) { /* special case one limb b, use modexact and no copying */ @@ -153,7 +153,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b) if (blow == 1) /* (a/1)=1 always */ return JACOBI_BIT1_TO_PN (result_bit1); - + JACOBI_MOD_OR_MODEXACT_1_ODD (result_bit1, alow, asrcp, asize, blow); TRACE (printf ("base (%lu/%lu) with %d\n", alow, blow, JACOBI_BIT1_TO_PN (result_bit1))); @@ -176,7 +176,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b) if (atwos != 0) alow |= asecond << (BITS_PER_MP_LIMB-atwos); } - + /* (a/2)=(2/a) with a odd */ result_bit1 ^= JACOBI_TWOS_U_BIT1 (btwos, alow); @@ -189,7 +189,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b) /* b still has its twos, so cancel out their effect */ result_bit1 ^= JACOBI_TWOS_U_BIT1 (btwos, alow); - + result_bit1 ^= JACOBI_RECIP_UU_BIT1 (alow, blow); /* now (b/a) */ JACOBI_MOD_OR_MODEXACT_1_ODD (result_bit1, blow, bsrcp, bsize, alow); TRACE (printf ("base (%lu/%lu) with %d\n", diff --git a/mpz/kronsz.c b/mpz/kronsz.c index b36b1a047..990b1ec20 100644 --- a/mpz/kronsz.c +++ b/mpz/kronsz.c @@ -91,7 +91,7 @@ mpz_si_kronecker (long a, mpz_srcptr b) result_bit1 ^= JACOBI_TWOS_U_BIT1 (BITS_PER_MP_LIMB-1, a); return JACOBI_BIT1_TO_PN (result_bit1); } - + /* b_abs_size > 1 */ b_low = b_ptr[1] << 1; } diff --git a/mpz/kronuz.c b/mpz/kronuz.c index a60e415b8..50920a4fe 100644 --- a/mpz/kronuz.c +++ b/mpz/kronuz.c @@ -65,7 +65,7 @@ mpz_ui_kronecker (unsigned long a, mpz_srcptr b) { if (b_abs_size == 1) /* (a/0x80000000) == (a/2)^(BPML-1) */ return JACOBI_TWOS_U (BITS_PER_MP_LIMB-1, a); - + /* b_abs_size > 1 */ b_low = b_ptr[1] << 1; } diff --git a/mpz/kronzs.c b/mpz/kronzs.c index 83adf07d3..d34f208b2 100644 --- a/mpz/kronzs.c +++ b/mpz/kronzs.c @@ -64,7 +64,7 @@ mpz_kronecker_si (mpz_srcptr a, long b) return 0; /* (even/even)=0 */ /* (a/2)=(2/a) for a odd */ - count_trailing_zeros (twos, b_limb); + count_trailing_zeros (twos, b_limb); b_limb >>= twos; result_bit1 ^= JACOBI_TWOS_U_BIT1 (twos, a_low); } diff --git a/mpz/kronzu.c b/mpz/kronzu.c index 646fe8db1..0d76ad74d 100644 --- a/mpz/kronzu.c +++ b/mpz/kronzu.c @@ -62,7 +62,7 @@ mpz_kronecker_ui (mpz_srcptr a, unsigned long b) return 0; /* (even/even)=0 */ /* (a/2)=(2/a) for a odd */ - count_trailing_zeros (twos, b); + count_trailing_zeros (twos, b); b >>= twos; result_bit1 = (JACOBI_TWOS_U_BIT1 (twos, a_low) ^ JACOBI_ASGN_SU_BIT1 (a_size, b)); diff --git a/mpz/lcm.c b/mpz/lcm.c index c9fd8d001..1aea24534 100644 --- a/mpz/lcm.c +++ b/mpz/lcm.c @@ -54,7 +54,7 @@ mpz_lcm (mpz_ptr r, mpz_srcptr u, mpz_srcptr v) vl = PTR(v)[0]; gl = mpn_gcd_1 (up, usize, vl); vl /= gl; - + rp = PTR(r); c = mpn_mul_1 (rp, up, usize, vl); rp[usize] = c; @@ -69,7 +69,7 @@ mpz_lcm (mpz_ptr r, mpz_srcptr u, mpz_srcptr v) MPZ_SRCPTR_SWAP (u, v); goto one; } - + TMP_MARK (marker); size = MAX (usize, vsize); MPZ_TMP_INIT (g, size); diff --git a/mpz/lucnum_ui.c b/mpz/lucnum_ui.c index 30d93304d..2af6b3e5f 100644 --- a/mpz/lucnum_ui.c +++ b/mpz/lucnum_ui.c @@ -25,7 +25,7 @@ MA 02111-1307, USA. */ /* change this to "#define TRACE(x) x" for diagnostics */ -#define TRACE(x) +#define TRACE(x) /* Notes: diff --git a/mpz/mul.c b/mpz/mul.c index c8c1916f3..329babe8b 100644 --- a/mpz/mul.c +++ b/mpz/mul.c @@ -77,7 +77,7 @@ mult (mpz_srcptr u, mpz_srcptr v, mpz_ptr w) usize += (cy_limb != 0); SIZ(w) = (sign_product >= 0 ? usize : -usize); return; - } + } #else if (vsize == 1) { @@ -88,7 +88,7 @@ mult (mpz_srcptr u, mpz_srcptr v, mpz_ptr w) usize += (cy_limb != 0); SIZ(w) = (sign_product >= 0 ? usize : -usize); return; - } + } #endif TMP_MARK (marker); diff --git a/mpz/n_pow_ui.c b/mpz/n_pow_ui.c index b7efa59a7..327c39281 100644 --- a/mpz/n_pow_ui.c +++ b/mpz/n_pow_ui.c @@ -398,7 +398,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e) the bit below the highest 1 (which will mean i==-1 if e==1). */ count_leading_zeros (cnt, e); i = BITS_PER_MP_LIMB - cnt - 2; - + #if HAVE_NATIVE_mpn_mul_2 if (bsize <= 2) { @@ -418,7 +418,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e) mult[0] = blimb_low; mult[1] = blimb; - + for ( ; i >= 0; i--) { TRACE (printf ("mul_2 loop i=%d e=0x%lX, rsize=%ld ralloc=%ld talloc=%ld\n", @@ -462,7 +462,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e) if ((e & (1L << i)) != 0) MPN_MUL_1 (rp, rsize, ralloc, blimb); } - + TRACE (mpn_trace ("mul_1 before rl, r", rp, rsize)); if (rl != 1) MPN_MUL_1 (rp, rsize, ralloc, rl); @@ -471,7 +471,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e) else { int parity; - + /* Arrange the final result ends up in r, not in the temp space */ ULONG_PARITY (parity, e); if (((parity ^ i) & 1) != 0) @@ -479,7 +479,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e) MPN_COPY (rp, bp, bsize); rsize = bsize; - + for ( ; i >= 0; i--) { TRACE (printf ("mul loop i=%d e=0x%lX, rsize=%ld ralloc=%ld talloc=%ld\n", @@ -494,14 +494,13 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e) SWAP_RP_TP; } } - - } + } } ASSERT (rp == PTR(r) + rtwos_limbs); TRACE (mpn_trace ("end loop r", rp, rsize)); TMP_FREE (marker); - + /* Apply any partial limb factors of 2. */ if (rtwos_bits != 0) { diff --git a/mpz/powm_ui.c b/mpz/powm_ui.c index ceeaad684..6f7da8f2c 100644 --- a/mpz/powm_ui.c +++ b/mpz/powm_ui.c @@ -155,7 +155,7 @@ mpz_powm_ui (mpz_ptr r, mpz_srcptr b, unsigned long int el, mpz_srcptr m) mp_limb_t cy; cy = mpn_lshift (tp, xp, xn, m_zero_cnt); tp[xn] = cy; xn += cy != 0; - + if (xn < mn) { MPN_COPY (xp, tp, xn); diff --git a/mpz/scan1.c b/mpz/scan1.c index 038a07bca..4ec1d2a3a 100644 --- a/mpz/scan1.c +++ b/mpz/scan1.c @@ -111,7 +111,7 @@ mpz_scan1 (mpz_srcptr u, unsigned long starting_bit) /* Adjust so ~limb implied by searching for 0 bit becomes -limb. */ limb--; - + inverted: /* Now seeking a 0 bit. */ diff --git a/rand.c b/rand.c index 1aa9eadd3..cc42ff088 100644 --- a/rand.c +++ b/rand.c @@ -69,7 +69,7 @@ gmp_randinit (va_alist) #if 0 case GMP_RAND_ALG_BBS: /* Blum, Blum, and Shub. */ - { + { mpz_t p, q; mpz_t ztmp; @@ -80,7 +80,7 @@ gmp_randinit (va_alist) /* These are around 128 bits. */ mpz_init_set_str (p, "148028650191182616877187862194899201391", 10); mpz_init_set_str (q, "315270837425234199477225845240496832591", 10); - + /* Allocate algorithm specific data. */ rstate->data.bbs = (__gmp_rand_data_bbs *) (*__gmp_allocate_func) (sizeof (__gmp_rand_data_bbs)); diff --git a/randlc.c b/randlc.c index 07ae5a580..04464dfdd 100644 --- a/randlc.c +++ b/randlc.c @@ -31,7 +31,7 @@ gmp_randinit_lc (gmp_randstate_t rstate, mpz_srcptr m) { /* FIXME: Not finished. We don't handle this in _gmp_rand() yet. */ - abort (); + abort (); mpz_init_set_ui (rstate->_mp_seed, 1); _mpz_realloc (rstate->_mp_seed, ABSIZ (m)); diff --git a/tests/rand/gen.c b/tests/rand/gen.c index c30c54b61..da3f674ef 100644 --- a/tests/rand/gen.c +++ b/tests/rand/gen.c @@ -155,7 +155,7 @@ int main (argc, argv) #else ul_adder = (unsigned long int) atoi (str_adder); #endif - + if (mpz_init_set_str (z_a, str_a, 0)) { fprintf (stderr, "gen: bad LC scheme parameter `a': %s\n", str_a); diff --git a/tests/rand/statlib.c b/tests/rand/statlib.c index f54886b57..377cd2345 100644 --- a/tests/rand/statlib.c +++ b/tests/rand/statlib.c @@ -63,7 +63,7 @@ for (each observation Xj) rm = max (rm, a[k] - j/n) j += c[k] rp = max (rp, j/n - b[k]) - + Kp = sqr (n) * rp Km = sqr (n) * rm @@ -539,7 +539,7 @@ spectral_test (mpf_t rop[], unsigned int T, mpz_t a, mpz_t m) mpz_set_ui (p, 1); mpz_set_ui (pp, 0); mpz_set (r, a); - mpz_pow_ui (s, a, 2); + mpz_pow_ui (s, a, 2); mpz_add_ui (s, s, 1); /* s = 1 + a^2 */ /* S2 [Euclidean step.] */ @@ -735,7 +735,7 @@ spectral_test (mpf_t rop[], unsigned int T, mpz_t a, mpz_t m) /* From Knuth p. 104: "The exhaustive search in steps S8-S10 reduces the value of s only rarely." */ -#ifdef DO_SEARCH +#ifdef DO_SEARCH /* S7 [Prepare for search.] */ /* Find minimum in (x[1], ..., x[t]) satisfying condition x[k]^2 <= f(y[1], ...,y[t]) * dot(V[k],V[k]) */ @@ -802,7 +802,7 @@ spectral_test (mpf_t rop[], unsigned int T, mpz_t a, mpz_t m) #endif /* DO_SEARCH */ mpf_set_z (f_tmp1, s); mpf_sqrt (rop[ui_t - 1], f_tmp1); -#ifdef DO_SEARCH +#ifdef DO_SEARCH if (g_debug > DEBUG_2) printf ("done.\n"); #endif /* DO_SEARCH */ -- cgit v1.2.1