--- ./fmpz.c.orig 2011-07-18 16:12:43.495375940 -0600
+++ ./fmpz.c 2011-07-18 16:12:53.376375939 -0600
@@ -1239,7 +1239,7 @@
flint_heap_free(comb->mod);
}
-unsigned long fmpz_multi_mod_ui_basecase(unsigned long * out, fmpz_t in,
+void fmpz_multi_mod_ui_basecase(unsigned long * out, fmpz_t in,
unsigned long * primes, unsigned long num_primes)
{
unsigned long i;
--- ./fmpz_poly.c.orig 2011-07-18 16:12:43.501375940 -0600
+++ ./fmpz_poly.c 2011-07-18 16:21:38.896375946 -0600
@@ -216,7 +216,7 @@
while (coeff_m < last_point)
{
- if ((ulong) coeff_m & 7 == 0) FLINT_PREFETCH(coeff_m, 64);
+ if ((((ulong) coeff_m) & 7) == 0) FLINT_PREFETCH(coeff_m, 64);
// k is guaranteed to be less than FLINT_BITS at this point
while ((k < HALF_FLINT_BITS) && (coeff_m < last_point))
{
@@ -390,7 +390,7 @@
while (coeff_m < next_point)
{
- if (skip & 7 == 0) FLINT_PREFETCH(array + skip, 64);
+ if ((skip & 7) == 0) FLINT_PREFETCH(array + skip, 64);
// read in a full limb
full_limb = array[skip];
temp2 += l_shift(full_limb,k);
@@ -1764,7 +1764,7 @@
for (i = 0, j = 0; i < poly_fmpz->length; i++, j += 2)
{
- if (i&3 == 0) FLINT_PREFETCH(coeffs_m+j,64);
+ if ((i&3) == 0) FLINT_PREFETCH(coeffs_m+j,64);
if ((long) coeffs_m[j] < 0) sign = -1L;
if (coeffs_m[j])
{
--- ./F_mpz_LLL.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./F_mpz_LLL.c 2011-07-18 16:12:53.378375939 -0600
@@ -3321,13 +3321,13 @@
int * copy_expo, * copy_alpha;
int ok = 1;
- int newd = d;
+ int newd;
double d_rii;
double d_gs_B;
ulong exp;
n = B->c;
- d = B->r;
+ d = newd = B->r;
D = d;
ctt = (4*DELTA + 1)/5;
--- ./QS/poly.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./QS/poly.c 2011-07-18 16:12:53.379375939 -0600
@@ -146,7 +146,7 @@
unsigned long factor, i, p;
unsigned long diff, best_diff, best1, best2;
- unsigned long A;
+ unsigned long A = 0;
if (s <= 4)
{
@@ -186,6 +186,7 @@
if (s == 5)
{
+ best1 = best2 = best_diff = 0;
A_ind[0] = ((z_randint(span) + min) | 1);
if (A_ind[0] == min + span) A_ind[0] -= 2;
--- ./QS/linear_algebra.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./QS/linear_algebra.c 2011-07-18 16:13:48.309375940 -0600
@@ -133,6 +133,7 @@
if (ra->data[point] > rb->data[point]) return 1;
else if (ra->data[point] < rb->data[point]) return -1;
+ return 0;
}
int tiny_relations_cmp2(const void *a, const void *b)
@@ -152,6 +153,7 @@
if (ra->data[point] > rb->data[point]) return 1;
else if (ra->data[point] < rb->data[point]) return -1;
+ return 0;
}
/*==========================================================================
--- ./QS/mp_linear_algebra.c.orig 2011-07-18 16:12:48.393375936 -0600
+++ ./QS/mp_linear_algebra.c 2011-07-18 16:12:53.380375939 -0600
@@ -142,6 +142,7 @@
if (ra->data[point] > rb->data[point]) return 1;
else if (ra->data[point] < rb->data[point]) return -1;
+ return 0;
}
int relations_cmp2(const void *a, const void *b)
@@ -161,6 +162,7 @@
if (ra->data[point] > rb->data[point]) return 1;
else if (ra->data[point] < rb->data[point]) return -1;
+ return 0;
}
/*==========================================================================
--- ./packed_vec.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./packed_vec.c 2011-07-18 16:12:53.381375939 -0600
@@ -173,7 +173,7 @@
#endif
PV_ITER_INIT(iter2, *vec, 0);
- ulong temp;
+ ulong temp = 0;
ulong i;
for (i = 0; i < vec->length; i++)
--- ./fmpz.h.orig 2011-07-18 16:12:43.537375940 -0600
+++ ./fmpz.h 2011-07-18 16:12:53.382375939 -0600
@@ -383,7 +383,7 @@
void fmpz_comb_temp_clear(fmpz_t ** temp, fmpz_comb_t comb);
-unsigned long fmpz_multi_mod_ui_basecase(unsigned long * out, fmpz_t in,
+void fmpz_multi_mod_ui_basecase(unsigned long * out, fmpz_t in,
unsigned long * primes, unsigned long num_primes);
void fmpz_multi_mod_ui(unsigned long * out, fmpz_t in, fmpz_comb_t comb, fmpz_t ** temp);
--- ./theta.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./theta.c 2011-07-18 16:12:53.383375939 -0600
@@ -75,7 +75,7 @@
fprintf(f, "*");
if (n == 1)
- fprintf(f, "q", n);
+ fprintf(f, "q");
if (n > 1)
fprintf(f, "q^%ld", n);
--- ./long_extras.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./long_extras.c 2011-07-18 16:12:53.386375939 -0600
@@ -1121,7 +1121,7 @@
int z_isprime_pocklington(unsigned long const n, unsigned long const iterations)
{
int i, j, k, pass, test, exp;
- unsigned long sqrt, n1, f, factor, prod, temp, b, c;
+ unsigned long sqrt, n1, f, factor, prod, temp, b, c = 1;
factor_t factors;
pre_inv_t inv;
--- ./F_mpz_poly.c.orig 2010-12-23 20:45:11.000000000 -0700
+++ ./F_mpz_poly.c 2011-07-18 16:19:18.863375945 -0600
@@ -2172,7 +2172,7 @@
while (coeff_m < end_point)
{
- if ((ulong) coeff_m & 7 == 0) FLINT_PREFETCH(coeff_m, 64);
+ if ((((ulong) coeff_m) & 7) == 0) FLINT_PREFETCH(coeff_m, 64);
// k is guaranteed to be less than FLINT_BITS at this point
while ((k < HALF_FLINT_BITS) && (coeff_m < end_point))
@@ -2276,7 +2276,7 @@
while (coeff_m < end_point)
{
- if ((ulong) coeff_m & 7 == 0) FLINT_PREFETCH(coeff_m, 64);
+ if ((((ulong) coeff_m) & 7) == 0) FLINT_PREFETCH(coeff_m, 64);
// k is guaranteed to be less than FLINT_BITS at this point
while ((k < HALF_FLINT_BITS) && (coeff_m < end_point))
@@ -2462,7 +2462,7 @@
while (coeff_m < end_point)
{
- if (skip & 7 == 0) FLINT_PREFETCH(array + skip, 64);
+ if ((skip & 7) == 0) FLINT_PREFETCH(array + skip, 64);
// read in a full limb
full_limb = array[skip];
temp += l_shift(full_limb, k);
@@ -2527,7 +2527,7 @@
while (coeff_m < end_point)
{
- if ((ulong) coeff_m & 7 == 0) FLINT_PREFETCH(coeff_m, 64);
+ if ((((ulong) coeff_m) & 7) == 0) FLINT_PREFETCH(coeff_m, 64);
// k is guaranteed to be less than FLINT_BITS at this point
while ((k < HALF_FLINT_BITS) && (coeff_m < end_point))
@@ -3956,8 +3956,8 @@
if ((bits - sign <= FLINT_BITS - 2) && (bits1) && (bits2)) bitpack = 1;
- mp_limb_t * int1, * int2, * int1b, * int2b, * int3, * int3b, * int4;
- ulong n1, n2;
+ mp_limb_t * int1 = NULL, * int2 = NULL, * int1b = NULL, * int2b = NULL, * int3, * int3b, * int4;
+ ulong n1 = 0, n2 = 0;
if (bitpack)
{
