From 15e8b70ae4726107a4eb80812ff141df74f3eac4 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Wed, 21 Jun 2023 20:54:32 -0400 Subject: [PATCH] Eliminate warnings --- src/confid.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/confid.rs b/src/confid.rs index 58328e6..8be83d4 100644 --- a/src/confid.rs +++ b/src/confid.rs @@ -270,7 +270,10 @@ unsafe extern "C" fn find_divisor_v(mut d: *mut TDivisor) -> i32 { let coeff1: uint64_t = residue_sub(residue_add(f0, f0), residue_mul(f1, u1)); if coeff2 == 0_i32 as u64 { if coeff1 == 0_i32 as u64 { - f1 == 0_i32 as u64; + if f1 == 0_i32 as u64 { + // impossible + panic!("bad f(), double root detected"); + } return 0_i32; } let mut sqr: uint64_t = residue_mul( @@ -814,7 +817,7 @@ unsafe extern "C" fn divisor_mul( } let mut cur: TDivisor = *src; while mult & 1_i32 as u64 == 0 { - divisor_add(&mut cur, &mut cur, &mut cur); + divisor_add(&cur, &cur, &mut cur); mult >>= 1_i32; } *dst = cur; @@ -823,9 +826,9 @@ unsafe extern "C" fn divisor_mul( if mult == 0_i32 as u64 { break; } - divisor_add(&mut cur, &mut cur, &mut cur); + divisor_add(&cur, &cur, &mut cur); if mult & 1_i32 as u64 != 0 { - divisor_add(dst, &mut cur, dst); + divisor_add(dst, &cur, dst); } } } @@ -845,7 +848,7 @@ unsafe extern "C" fn divisor_mul128( } let mut cur: TDivisor = *src; while mult_lo & 1_i32 as u64 == 0 { - divisor_add(&mut cur, &mut cur, &mut cur); + divisor_add(&cur, &cur, &mut cur); mult_lo >>= 1_i32; if mult_hi & 1_i32 as u64 != 0 { mult_lo = (mult_lo | 1_u64 << 63_i32) as uint64_t; @@ -862,9 +865,9 @@ unsafe extern "C" fn divisor_mul128( if mult_lo == 0_i32 as u64 && mult_hi == 0_i32 as u64 { break; } - divisor_add(&mut cur, &mut cur, &mut cur); + divisor_add(&cur, &cur, &mut cur); if mult_lo & 1_i32 as u64 != 0 { - divisor_add(dst, &mut cur, dst); + divisor_add(dst, &cur, dst); } } } @@ -1280,7 +1283,7 @@ unsafe extern "C" fn Generate( return 6_i32; } divisor_mul128( - &mut d_0, + &d_0, 0x4e21b9d10f127c1_i64 as uint64_t, 0x40da7c36d44c_i64 as uint64_t, &mut d_0,