[Ecm-commits] r2369 - trunk

cvs commits ecm-commits at lists.gforge.inria.fr
Fri Feb 1 18:06:54 CET 2013


Author: morain
Date: 2013-02-01 18:06:54 +0100 (Fri, 01 Feb 2013)
New Revision: 2369

Log:
Fixed compiler warnings indicating bad pointer protos. Testing before
implementing a new faster version for CM stuff.


Modified:
   trunk/cmecm.c
   trunk/cmecm.h
   trunk/ecm-impl.h
   trunk/ecm2.c
   trunk/stage2.c
Modified: trunk/cmecm.c
===================================================================
--- trunk/cmecm.c	2013-02-01 16:30:50 UTC (rev 2368)
+++ trunk/cmecm.c	2013-02-01 17:06:54 UTC (rev 2369)
@@ -581,7 +581,7 @@
 ecm_rootsG_init_CM (mpz_t f, curve *X, root_params_t *root_params, 
 		    unsigned long dF, unsigned long blocks, mpmod_t modulus)
 {
-    ecm_roots_state_t *state = NULL;
+    ecm_roots_state_t *state;
     progression_params_t *params; /* for less typing */
     ec_curve_t E;
     ec_point_t P, duP;

Modified: trunk/cmecm.h
===================================================================
--- trunk/cmecm.h	2013-02-01 16:30:50 UTC (rev 2368)
+++ trunk/cmecm.h	2013-02-01 17:06:54 UTC (rev 2369)
@@ -2,3 +2,5 @@
 void
 set_stage2_params_CM(unsigned long *pdF, unsigned long *pk, mpz_t B2, int disc);
 int ecm_rootsF_CM(mpz_t f, listz_t F, unsigned long dF, curve *C, mpmod_t modulus);
+ecm_roots_state_t *ecm_rootsG_init_CM (mpz_t f, curve *X, root_params_t *root_params, unsigned long dF, unsigned long blocks, mpmod_t modulus);
+int ecm_rootsG_CM (mpz_t f, listz_t G, unsigned long dF, ecm_roots_state_t *state, mpmod_t modulus);

Modified: trunk/ecm-impl.h
===================================================================
--- trunk/ecm-impl.h	2013-02-01 16:30:50 UTC (rev 2368)
+++ trunk/ecm-impl.h	2013-02-01 17:06:54 UTC (rev 2369)
@@ -364,7 +364,7 @@
 /* ecm2.c */
 #define ecm_rootsF __ECM(ecm_rootsF)
 int     ecm_rootsF       (mpz_t, listz_t, root_params_t *, unsigned long, 
-                          curve *, mpmod_t, double, mpz_t);
+                          curve *, mpmod_t);
 #define ecm_rootsG_init __ECM(ecm_rootsG_init)
 ecm_roots_state_t* ecm_rootsG_init (mpz_t, curve *, root_params_t *, 
                                     unsigned long, unsigned long, mpmod_t);

Modified: trunk/ecm2.c
===================================================================
--- trunk/ecm2.c	2013-02-01 16:30:50 UTC (rev 2368)
+++ trunk/ecm2.c	2013-02-01 17:06:54 UTC (rev 2369)
@@ -439,7 +439,7 @@
 
 int
 ecm_rootsF (mpz_t f, listz_t F, root_params_t *root_params, 
-            unsigned long dF, curve *s, mpmod_t modulus, double B1, mpz_t B2)
+            unsigned long dF, curve *s, mpmod_t modulus)
 {
   unsigned long i;
   unsigned long muls = 0, gcds = 0;

Modified: trunk/stage2.c
===================================================================
--- trunk/stage2.c	2013-02-01 16:30:50 UTC (rev 2368)
+++ trunk/stage2.c	2013-02-01 17:06:54 UTC (rev 2369)
@@ -418,7 +418,7 @@
   H = T;
 
   /* needs dF+1 cells in T */
-  youpi = ecm_rootsF (f, F, root_params, dF, (curve*) X, modulus, B1, B2);
+  youpi = ecm_rootsF (f, F, root_params, dF, (curve*) X, modulus);
 
   if (youpi != ECM_NO_FACTOR_FOUND)
     {




More information about the Ecm-commits mailing list